lockd: move struct nlm_wait to lockd.h

The next patch needs struct nlm_wait in fs/lockd/clntproc.c, so move
the definition to a shared header file. As an added clean-up, drop
the unused b_reclaim field.

Signed-off-by: Jeff Layton <jlayton@kernel.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>

diff --git a/fs/lockd/clntlock.c b/fs/lockd/clntlock.c
index 82b19a30e0f028127a111ae735381fc0197a3199..464cb15c1a0662e552807ddd4b85a26153426136 100644 (file)
--- a/fs/lockd/clntlock.c
+++ b/fs/lockd/clntlock.c
@@ -29,18 +29,6 @@ static int                   reclaimer(void *ptr);
  * client perspective.
  */
 
-/*
- * This is the representation of a blocked client lock.
- */
-struct nlm_wait {
-       struct list_head        b_list;         /* linked list */
-       wait_queue_head_t       b_wait;         /* where to wait on */
-       struct nlm_host *       b_host;
-       struct file_lock *      b_lock;         /* local file lock */
-       unsigned short          b_reclaim;      /* got to reclaim lock */
-       __be32                  b_status;       /* grant callback status */
-};
-
 static LIST_HEAD(nlm_blocked);
 static DEFINE_SPINLOCK(nlm_blocked_lock);
 

diff --git a/include/linux/lockd/lockd.h b/include/linux/lockd/lockd.h
index 26c2aed31a0c5a7c8a7621399ea94d85dc807498..de5ad2c2179adcc0f91e7d8990c238933c6c7807 100644 (file)
--- a/include/linux/lockd/lockd.h
+++ b/include/linux/lockd/lockd.h
@@ -121,7 +121,16 @@ struct nlm_lockowner {
        uint32_t pid;
 };
 
-struct nlm_wait;
+/*
+ * This is the representation of a blocked client lock.
+ */
+struct nlm_wait {
+       struct list_head        b_list;         /* linked list */
+       wait_queue_head_t       b_wait;         /* where to wait on */
+       struct nlm_host         *b_host;
+       struct file_lock        *b_lock;        /* local file lock */
+       __be32                  b_status;       /* grant callback status */
+};
 
 /*
  * Memory chunk for NLM client RPC request.