From ad21765bd9a851792651ad6a72afed69cb797536 Mon Sep 17 00:00:00 2001 From: adilger Date: Tue, 20 Jan 2009 05:16:10 +0000 Subject: [PATCH] Branch b1_8 Minor updates to lustre_idl.h to make it largely match the version in HEAD. A number of new #defines from HEAD are added to avoid potential future conflicts, along with whitespace cleanups. b=17800 --- lustre/ptlrpc/wiretest.c | 4 ++-- lustre/utils/wiretest.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lustre/ptlrpc/wiretest.c b/lustre/ptlrpc/wiretest.c index 2407c0b..9ef6a45 100644 --- a/lustre/ptlrpc/wiretest.c +++ b/lustre/ptlrpc/wiretest.c @@ -531,8 +531,8 @@ void lustre_assert_wire_constants(void) CLASSERT(OBD_CONNECT_JOIN == 0x2000ULL); CLASSERT(OBD_CONNECT_ATTRFID == 0x4000ULL); CLASSERT(OBD_CONNECT_NODEVOH == 0x8000ULL); - CLASSERT(OBD_CONNECT_LCL_CLIENT == 0x10000ULL); - CLASSERT(OBD_CONNECT_RMT_CLIENT == 0x20000ULL); + CLASSERT(OBD_CONNECT_RMT_CLIENT == 0x10000ULL); + CLASSERT(OBD_CONNECT_RMT_CLIENT_FORCE == 0x20000ULL); CLASSERT(OBD_CONNECT_BRW_SIZE == 0x40000ULL); CLASSERT(OBD_CONNECT_QUOTA64 == 0x80000ULL); CLASSERT(OBD_CONNECT_MDS_CAPA == 0x100000ULL); diff --git a/lustre/utils/wiretest.c b/lustre/utils/wiretest.c index dd98a0e..89c8e26 100644 --- a/lustre/utils/wiretest.c +++ b/lustre/utils/wiretest.c @@ -529,8 +529,8 @@ void lustre_assert_wire_constants(void) CLASSERT(OBD_CONNECT_JOIN == 0x2000ULL); CLASSERT(OBD_CONNECT_ATTRFID == 0x4000ULL); CLASSERT(OBD_CONNECT_NODEVOH == 0x8000ULL); - CLASSERT(OBD_CONNECT_LCL_CLIENT == 0x10000ULL); - CLASSERT(OBD_CONNECT_RMT_CLIENT == 0x20000ULL); + CLASSERT(OBD_CONNECT_RMT_CLIENT == 0x10000ULL); + CLASSERT(OBD_CONNECT_RMT_CLIENT_FORCE == 0x20000ULL); CLASSERT(OBD_CONNECT_BRW_SIZE == 0x40000ULL); CLASSERT(OBD_CONNECT_QUOTA64 == 0x80000ULL); CLASSERT(OBD_CONNECT_MDS_CAPA == 0x100000ULL); -- 1.8.3.1