Branch b1_8

b=12069
i=adilger

Reserve bits for checksum type.

diff --git a/lustre/include/lustre/lustre_idl.h b/lustre/include/lustre/lustre_idl.h
index 4396062..8f3ce25 100644 (file)
--- a/lustre/include/lustre/lustre_idl.h
+++ b/lustre/include/lustre/lustre_idl.h
@@ -489,7 +489,10 @@ typedef __u32 obd_count;
 #define OBD_FL_TRUNCLOCK     (0x00000800) /* delegate DLM locking during punch */
 #define OBD_FL_CKSUM_CRC32   (0x00001000) /* CRC32 checksum type */
 #define OBD_FL_CKSUM_ADLER   (0x00002000) /* ADLER checksum type */
-#define OBD_FL_SHRINK_GRANT  (0x00004000) /* object shrink the grant */
+#define OBD_FL_CKSUM_RESV1   (0x00004000) /* reserved for future checksum type */
+#define OBD_FL_CKSUM_RESV2   (0x00008000) /* reserved for future checksum type */
+#define OBD_FL_CKSUM_RESV3   (0x00010000) /* reserved for future checksum type */
+#define OBD_FL_SHRINK_GRANT  (0x00020000) /* object shrink the grant */
 
 
 #define OBD_FL_CKSUM_ALL      (OBD_FL_CKSUM_CRC32 | OBD_FL_CKSUM_ADLER)

diff --git a/lustre/ptlrpc/wiretest.c b/lustre/ptlrpc/wiretest.c
index 390101f..20acff7 100644 (file)
--- a/lustre/ptlrpc/wiretest.c
+++ b/lustre/ptlrpc/wiretest.c
@@ -722,6 +722,7 @@ void lustre_assert_wire_constants(void)
         CLASSERT(OBD_FL_TRUNCLOCK == (0x00000800));
         CLASSERT(OBD_FL_CKSUM_CRC32 == (0x00001000));
         CLASSERT(OBD_FL_CKSUM_ADLER == (0x00002000));
+        CLASSERT(OBD_FL_SHRINK_GRANT == (0x00020000));
         CLASSERT(OBD_CKSUM_CRC32 == 1);
         CLASSERT(OBD_CKSUM_ADLER == 2);
 

diff --git a/lustre/utils/wirecheck.c b/lustre/utils/wirecheck.c
index 903a7cb..47bf94b 100644 (file)
--- a/lustre/utils/wirecheck.c
+++ b/lustre/utils/wirecheck.c
@@ -329,6 +329,7 @@ check_obdo(void)
         CHECK_CDEFINE(OBD_FL_TRUNCLOCK);
         CHECK_CDEFINE(OBD_FL_CKSUM_CRC32);
         CHECK_CDEFINE(OBD_FL_CKSUM_ADLER);
+        CHECK_CDEFINE(OBD_FL_SHRINK_GRANT);
         CHECK_CVALUE(OBD_CKSUM_CRC32);
         CHECK_CVALUE(OBD_CKSUM_ADLER);
 }

diff --git a/lustre/utils/wiretest.c b/lustre/utils/wiretest.c
index 2558cab..1585b04 100644 (file)
--- a/lustre/utils/wiretest.c
+++ b/lustre/utils/wiretest.c
@@ -720,6 +720,7 @@ void lustre_assert_wire_constants(void)
         CLASSERT(OBD_FL_TRUNCLOCK == (0x00000800));
         CLASSERT(OBD_FL_CKSUM_CRC32 == (0x00001000));
         CLASSERT(OBD_FL_CKSUM_ADLER == (0x00002000));
+        CLASSERT(OBD_FL_SHRINK_GRANT == (0x00020000));
         CLASSERT(OBD_CKSUM_CRC32 == 1);
         CLASSERT(OBD_CKSUM_ADLER == 2);