diff options
| author | Jinshan Xiong <jinshan.xiong@intel.com> | 2016-09-18 20:38:32 (GMT) |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-09-19 07:53:46 (GMT) |
| commit | 8b915c1ef5ba61127f364b5cff5f7315d9ded197 (patch) | |
| tree | 0a8a1ba2ab889c0b198d8f2635459f3cf71c5140 | |
| parent | 26ad0dc30eee1bd27c2f712f564bc2a217f9fff9 (diff) | |
| download | linux-8b915c1ef5ba61127f364b5cff5f7315d9ded197.tar.xz | |
staging: lustre: 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>
Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-6028
Reviewed-on: http://review.whamcloud.com/13074
Reviewed-by: Bobi Jam <bobijam@gmail.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>
Signed-off-by: James Simmons <jsimmons@infradead.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/staging/lustre/lustre/include/lustre/lustre_idl.h | 2 | ||||
| -rw-r--r-- | drivers/staging/lustre/lustre/include/lustre_dlm.h | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/drivers/staging/lustre/lustre/include/lustre/lustre_idl.h b/drivers/staging/lustre/lustre/include/lustre/lustre_idl.h index 445b813..acb2806 100644 --- a/drivers/staging/lustre/lustre/include/lustre/lustre_idl.h +++ b/drivers/staging/lustre/lustre/include/lustre/lustre_idl.h @@ -2716,8 +2716,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/drivers/staging/lustre/lustre/include/lustre_dlm.h b/drivers/staging/lustre/lustre/include/lustre_dlm.h index 1ec4231..d035344 100644 --- a/drivers/staging/lustre/lustre/include/lustre_dlm.h +++ b/drivers/staging/lustre/lustre/include/lustre_dlm.h @@ -573,6 +573,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 |