From: Jinshan Xiong <jinshan.xiong@intel.com>
Date: Mon, 15 Dec 2014 20:48:23 +0000 (-0800)
Subject: LU-6028 ldlm: move LDLM_GID_ANY to lustre_dlm.h
X-Git-Tag: 2.6.92~38
X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=commitdiff_plain;h=0596cbd6d1947d3f479892a3b4f92c50b092ab0c

LU-6028 ldlm: move LDLM_GID_ANY to lustre_dlm.h

lustre_idl.h only includes wire data; lustre_dlm.h is the
right place for LDLM_GID_ANY.

Signed-off-by: Jinshan Xiong <jinshan.xiong@intel.com>
Change-Id: I832796e924116e80c079494f6928c037e7e4f2aa
Reviewed-on: http://review.whamcloud.com/13074
Tested-by: Jenkins
Reviewed-by: Bobi Jam <bobijam@gmail.com>
Tested-by: Maloo <hpdd-maloo@intel.com>
Reviewed-by: James Simmons <uja.ornl@gmail.com>
Reviewed-by: John L. Hammond <john.hammond@intel.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>
---

diff --git a/lustre/include/lustre/lustre_idl.h b/lustre/include/lustre/lustre_idl.h
index 26da4c3..64cb2a9 100644
--- a/lustre/include/lustre/lustre_idl.h
+++ b/lustre/include/lustre/lustre_idl.h
@@ -2967,8 +2967,6 @@ struct ldlm_extent {
         __u64 gid;
 };
 
-#define LDLM_GID_ANY  ((__u64) -1)
-
 static inline int ldlm_extent_overlap(const struct ldlm_extent *ex1,
 				      const struct ldlm_extent *ex2)
 {
diff --git a/lustre/include/lustre_dlm.h b/lustre/include/lustre_dlm.h
index 1b988b2..8d36603 100644
--- a/lustre/include/lustre_dlm.h
+++ b/lustre/include/lustre_dlm.h
@@ -650,6 +650,11 @@ enum lvb_type {
 };
 
 /**
+ * LDLM_GID_ANY is used to match any group id in ldlm_lock_match().
+ */
+#define LDLM_GID_ANY  ((__u64)-1)
+
+/**
  * LDLM lock structure
  *
  * Represents a single LDLM lock and its state in memory. Each lock is