From: wangdi Date: Mon, 19 Sep 2005 07:31:08 +0000 (+0000) Subject: Branch: HEAD X-Git-Tag: 1.4.10~479 X-Git-Url: https://git.whamcloud.com/gitweb?a=commitdiff_plain;h=a9a7721c83b1a01e919a4f6aeaecc4fd12d0ce23;p=fs%2Flustre-release.git Branch: HEAD typo fix about ldlm flags --- diff --git a/lustre/include/linux/lustre_dlm.h b/lustre/include/linux/lustre_dlm.h index 3e69945..8111636 100644 --- a/lustre/include/linux/lustre_dlm.h +++ b/lustre/include/linux/lustre_dlm.h @@ -76,7 +76,6 @@ 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 */ @@ -113,6 +112,8 @@ typedef enum { /* while this flag is set, the lock can't change resource */ #define LDLM_FL_LOCK_PROTECT 0x4000000 + +#define LDLM_FL_CONFIG_CHANGE 0x8000000 /* see ldlm_cli_cancel_unused */ #define LDLM_FL_LOCK_PROTECT_BIT 26 /* The blocking callback is overloaded to perform two functions. These flags