Commit f0aa4852 authored by Jeff Layton's avatar Jeff Layton Committed by Chuck Lever

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: default avatarJeff Layton <jlayton@kernel.org>
Signed-off-by: default avatarChuck Lever <chuck.lever@oracle.com>
parent c88c680c
...@@ -29,18 +29,6 @@ static int reclaimer(void *ptr); ...@@ -29,18 +29,6 @@ static int reclaimer(void *ptr);
* client perspective. * 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 LIST_HEAD(nlm_blocked);
static DEFINE_SPINLOCK(nlm_blocked_lock); static DEFINE_SPINLOCK(nlm_blocked_lock);
......
...@@ -121,7 +121,16 @@ struct nlm_lockowner { ...@@ -121,7 +121,16 @@ struct nlm_lockowner {
uint32_t pid; 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. * Memory chunk for NLM client RPC request.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment