From 470339f456d8e5d27fa7a10103432ae264bf88f4 Mon Sep 17 00:00:00 2001 From: Fan Yong Date: Wed, 2 Jun 2010 09:30:17 +0800 Subject: [PATCH] b=22560 fix OBD_CONNECT_FULL20 for conflict with OBD_CONNECT_MAX_EASIZE fix OBD_CONNECT_FULL20 for conflict with OBD_CONNECT_MAX_EASIZE i=robert.read i=andreas.dilger --- lustre/include/lustre/lustre_idl.h | 3 ++- lustre/obdclass/lprocfs_status.c | 1 + lustre/ptlrpc/wiretest.c | 2 +- lustre/utils/wiretest.c | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/lustre/include/lustre/lustre_idl.h b/lustre/include/lustre/lustre_idl.h index c77fff7..cb6557f 100644 --- a/lustre/include/lustre/lustre_idl.h +++ b/lustre/include/lustre/lustre_idl.h @@ -797,7 +797,8 @@ extern void lustre_swab_ptlrpc_body(struct ptlrpc_body *pb); #define OBD_CONNECT_LOV_V3 0x100000000ULL /*client supports LOV v3 EA */ #define OBD_CONNECT_GRANT_SHRINK 0x200000000ULL /* support grant shrink */ #define OBD_CONNECT_SKIP_ORPHAN 0x400000000ULL /* don't reuse orphan objids */ -#define OBD_CONNECT_FULL20 0x800000000ULL /* it is 2.0 client */ +#define OBD_CONNECT_MAX_EASIZE 0x800000000ULL /* preserved for large EA */ +#define OBD_CONNECT_FULL20 0x1000000000ULL /* it is 2.0 client */ /* also update obd_connect_names[] for lprocfs_rd_connect_flags() * and lustre/utils/wirecheck.c */ diff --git a/lustre/obdclass/lprocfs_status.c b/lustre/obdclass/lprocfs_status.c index 5463e77..33fa27e 100644 --- a/lustre/obdclass/lprocfs_status.c +++ b/lustre/obdclass/lprocfs_status.c @@ -766,6 +766,7 @@ static const char *obd_connect_names[] = { "pools", "grant_shrink", "skip_orphan", + "large_ea", "full20", NULL }; diff --git a/lustre/ptlrpc/wiretest.c b/lustre/ptlrpc/wiretest.c index f61dbab..ad9f822 100644 --- a/lustre/ptlrpc/wiretest.c +++ b/lustre/ptlrpc/wiretest.c @@ -492,7 +492,7 @@ void lustre_assert_wire_constants(void) CLASSERT(OBD_CONNECT_LRU_RESIZE == 0x2000000ULL); CLASSERT(OBD_CONNECT_VBR == 0x80000000ULL); CLASSERT(OBD_CONNECT_SKIP_ORPHAN == 0x400000000ULL); - CLASSERT(OBD_CONNECT_FULL20 == 0x800000000ULL); + CLASSERT(OBD_CONNECT_FULL20 == 0x1000000000ULL); /* Checks for struct obdo */ LASSERTF((int)sizeof(struct obdo) == 208, " found %lld\n", diff --git a/lustre/utils/wiretest.c b/lustre/utils/wiretest.c index 38f13b4..d32fd90 100644 --- a/lustre/utils/wiretest.c +++ b/lustre/utils/wiretest.c @@ -489,7 +489,7 @@ void lustre_assert_wire_constants(void) CLASSERT(OBD_CONNECT_LRU_RESIZE == 0x2000000ULL); CLASSERT(OBD_CONNECT_VBR == 0x80000000ULL); CLASSERT(OBD_CONNECT_SKIP_ORPHAN == 0x400000000ULL); - CLASSERT(OBD_CONNECT_FULL20 == 0x800000000ULL); + CLASSERT(OBD_CONNECT_FULL20 == 0x1000000000ULL); /* Checks for struct obdo */ LASSERTF((int)sizeof(struct obdo) == 208, " found %lld\n", -- 1.8.3.1