Skip to content

Commit f0aa485

Browse files
jtlaytonchucklever
authored andcommitted
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 <[email protected]> Signed-off-by: Chuck Lever <[email protected]>
1 parent c88c680 commit f0aa485

File tree

2 files changed

+10
-13
lines changed

2 files changed

+10
-13
lines changed

fs/lockd/clntlock.c

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -29,18 +29,6 @@ static int reclaimer(void *ptr);
2929
* client perspective.
3030
*/
3131

32-
/*
33-
* This is the representation of a blocked client lock.
34-
*/
35-
struct nlm_wait {
36-
struct list_head b_list; /* linked list */
37-
wait_queue_head_t b_wait; /* where to wait on */
38-
struct nlm_host * b_host;
39-
struct file_lock * b_lock; /* local file lock */
40-
unsigned short b_reclaim; /* got to reclaim lock */
41-
__be32 b_status; /* grant callback status */
42-
};
43-
4432
static LIST_HEAD(nlm_blocked);
4533
static DEFINE_SPINLOCK(nlm_blocked_lock);
4634

include/linux/lockd/lockd.h

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,16 @@ struct nlm_lockowner {
121121
uint32_t pid;
122122
};
123123

124-
struct nlm_wait;
124+
/*
125+
* This is the representation of a blocked client lock.
126+
*/
127+
struct nlm_wait {
128+
struct list_head b_list; /* linked list */
129+
wait_queue_head_t b_wait; /* where to wait on */
130+
struct nlm_host *b_host;
131+
struct file_lock *b_lock; /* local file lock */
132+
__be32 b_status; /* grant callback status */
133+
};
125134

126135
/*
127136
* Memory chunk for NLM client RPC request.

0 commit comments

Comments
 (0)