Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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>
authored by
Jeff Layton
and committed by
Chuck Lever
f0aa4852
c88c680c
+10
-13
-12
fs/lockd/clntlock.c
-12
fs/lockd/clntlock.c
···
29
29
* client perspective.
30
30
*/
31
31
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
-
44
32
static LIST_HEAD(nlm_blocked);
45
33
static DEFINE_SPINLOCK(nlm_blocked_lock);
46
34
+10
-1
include/linux/lockd/lockd.h
+10
-1
include/linux/lockd/lockd.h
···
121
121
uint32_t pid;
122
122
};
123
123
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
+
};
125
134
126
135
/*
127
136
* Memory chunk for NLM client RPC request.