From 22a61aea30ac19159cece7872486e4e5bd272384 Mon Sep 17 00:00:00 2001 From: bobijam Date: Tue, 10 Mar 2009 02:08:49 +0000 Subject: [PATCH] Branch b1_6 b=12069 i=adilger Reserve bits for checksum type. --- lustre/include/lustre/lustre_idl.h | 5 ++++- lustre/ptlrpc/wiretest.c | 1 + lustre/utils/wirecheck.c | 3 ++- lustre/utils/wiretest.c | 1 + 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/lustre/include/lustre/lustre_idl.h b/lustre/include/lustre/lustre_idl.h index a1ae407..cd45d30 100644 --- a/lustre/include/lustre/lustre_idl.h +++ b/lustre/include/lustre/lustre_idl.h @@ -461,7 +461,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 34906e4..c2d5208 100644 --- a/lustre/ptlrpc/wiretest.c +++ b/lustre/ptlrpc/wiretest.c @@ -702,6 +702,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 4d3a8a2..fd6b310 100644 --- a/lustre/utils/wirecheck.c +++ b/lustre/utils/wirecheck.c @@ -325,6 +325,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); } @@ -1352,7 +1353,7 @@ main(int argc, char **argv) CHECK_VALUE(MGS_CONNECT); CHECK_VALUE(MGS_DISCONNECT); - CHECK_VALUE(MGS_EXCEPTION); + CHECK_VALUE(MGS_EXCEPTION); CHECK_VALUE(MGS_TARGET_REG); CHECK_VALUE(MGS_TARGET_DEL); CHECK_VALUE(MGS_SET_INFO); diff --git a/lustre/utils/wiretest.c b/lustre/utils/wiretest.c index e241376..e5572bb 100644 --- a/lustre/utils/wiretest.c +++ b/lustre/utils/wiretest.c @@ -700,6 +700,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); -- 1.8.3.1