From 6bef9dbe0305c56edaf6af51dc42061001ee4b5d Mon Sep 17 00:00:00 2001 From: wangdi Date: Fri, 16 Sep 2005 15:27:35 +0000 Subject: [PATCH 1/1] Branch: HEAD fix LDLM flags defination confilct --- lustre/include/linux/lustre_dlm.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lustre/include/linux/lustre_dlm.h b/lustre/include/linux/lustre_dlm.h index 81b836f..3e69945 100644 --- a/lustre/include/linux/lustre_dlm.h +++ b/lustre/include/linux/lustre_dlm.h @@ -65,7 +65,6 @@ typedef enum { #define LDLM_FL_LOCAL 0x004000 /* local lock (ie, no srv/cli split) */ #define LDLM_FL_WARN 0x008000 /* see ldlm_cli_cancel_unused */ #define LDLM_FL_DISCARD_DATA 0x010000 /* discard (no writeback) on cancel */ -#define LDLM_FL_CONFIG_CHANGE 0x020000 /* see ldlm_cli_cancel_unused */ #define LDLM_FL_NO_TIMEOUT 0x020000 /* Blocked by group lock - wait * indefinitely */ @@ -77,6 +76,8 @@ typedef enum { #define LDLM_FL_DEADLOCK_CHK 0x20000000 /* check for deadlock */ #define LDLM_FL_DEADLOCK_DEL 0x40000000 /* lock no longer blocked */ +#define LDLM_FL_CONFIG_CHANGE 0x80000000 /* see ldlm_cli_cancel_unused */ + /* These are flags that are mapped into the flags and ASTs of blocking locks */ #define LDLM_AST_DISCARD_DATA 0x80000000 /* Add FL_DISCARD to blocking ASTs */ /* Flags sent in AST lock_flags to be mapped into the receiving lock. */ -- 1.8.3.1