summaryrefslogtreecommitdiffstats
path: root/sys
diff options
context:
space:
mode:
authorpjd <pjd@FreeBSD.org>2006-08-11 18:39:58 +0000
committerpjd <pjd@FreeBSD.org>2006-08-11 18:39:58 +0000
commitd9810ee8e29c0c3fee432a1a3ca4c150f11e98e2 (patch)
tree8e48755d750cc03e23c5b3f06db3dd189dc08d18 /sys
parentbe4056d8d76d9a93b882980d9868de0fe07a1569 (diff)
downloadFreeBSD-src-d9810ee8e29c0c3fee432a1a3ca4c150f11e98e2.zip
FreeBSD-src-d9810ee8e29c0c3fee432a1a3ca4c150f11e98e2.tar.gz
Forgot to bump version number after G_ELI_FLAG_READONLY flag addition.
Diffstat (limited to 'sys')
-rw-r--r--sys/geom/eli/g_eli.h8
1 files changed, 5 insertions, 3 deletions
diff --git a/sys/geom/eli/g_eli.h b/sys/geom/eli/g_eli.h
index e217c1f..9a507e0 100644
--- a/sys/geom/eli/g_eli.h
+++ b/sys/geom/eli/g_eli.h
@@ -56,8 +56,9 @@
* 0 - Initial version number.
* 1 - Added data authentication support (md_aalgo field and
* G_ELI_FLAG_AUTH flag).
+ * 2 - Added G_ELI_FLAG_READONLY.
*/
-#define G_ELI_VERSION 1
+#define G_ELI_VERSION 2
/* ON DISK FLAGS. */
/* Use random, onetime keys. */
@@ -223,7 +224,7 @@ eli_metadata_decode_v0(const u_char *data, struct g_eli_metadata *md)
return (0);
}
static __inline int
-eli_metadata_decode_v1(const u_char *data, struct g_eli_metadata *md)
+eli_metadata_decode_v1v2(const u_char *data, struct g_eli_metadata *md)
{
MD5_CTX ctx;
const u_char *p;
@@ -258,7 +259,8 @@ eli_metadata_decode(const u_char *data, struct g_eli_metadata *md)
error = eli_metadata_decode_v0(data, md);
break;
case 1:
- error = eli_metadata_decode_v1(data, md);
+ case 2:
+ error = eli_metadata_decode_v1v2(data, md);
break;
default:
error = EINVAL;
OpenPOWER on IntegriCloud