From cac7eb4601cdcab894c749289e0cd91cc7a50e58 Mon Sep 17 00:00:00 2001 From: Fan Yong Date: Fri, 21 May 2010 15:40:48 +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=johann i=andreas.dilger --- lustre/include/lustre/lustre_idl.h | 3 ++- lustre/obdclass/lprocfs_status.c | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/lustre/include/lustre/lustre_idl.h b/lustre/include/lustre/lustre_idl.h index 0ef03e6..9134f52 100644 --- a/lustre/include/lustre/lustre_idl.h +++ b/lustre/include/lustre/lustre_idl.h @@ -359,7 +359,8 @@ extern void lustre_swab_ptlrpc_body(struct ptlrpc_body *pb, int msgsize); #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 /* this flag is only used for +#define OBD_CONNECT_MAX_EASIZE 0x800000000ULL /* preserved for large EA */ +#define OBD_CONNECT_FULL20 0x1000000000ULL /* this flag is only used for * 2.0 client, don't reuse it * on b1_8 or older releases */ /* also update obd_connect_names[] for lprocfs_rd_connect_flags() diff --git a/lustre/obdclass/lprocfs_status.c b/lustre/obdclass/lprocfs_status.c index 74cf3c4..4804834 100644 --- a/lustre/obdclass/lprocfs_status.c +++ b/lustre/obdclass/lprocfs_status.c @@ -744,6 +744,7 @@ static const char *obd_connect_names[] = { "pools", "grant_shrink", "skip_orphan", + "large_ea", "full20", NULL }; -- 1.8.3.1