aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorOlaf Kirch <okir@suse.de>2006-10-04 05:15:57 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2006-10-04 10:55:17 -0400
commit68a2d76cea4234bc027df23085d9df4f2171f7fc (patch)
tree79a595aaebb198f3692e9187d0284bc4ac18f469 /include
parent0cea32761a2f954c6d42ca79d7d1e6b9663b1e4a (diff)
[PATCH] knfsd: lockd: Change list of blocked list to list_node
This patch changes the nlm_blocked list to use a list_node instead of homegrown linked list handling. Signed-off-by: Olaf Kirch <okir@suse.de> Signed-off-by: Neil Brown <neilb@suse.de> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include')
-rw-r--r--include/linux/lockd/lockd.h7
1 files changed, 3 insertions, 4 deletions
diff --git a/include/linux/lockd/lockd.h b/include/linux/lockd/lockd.h
index c8635d84d5d2..2e740f6a2f77 100644
--- a/include/linux/lockd/lockd.h
+++ b/include/linux/lockd/lockd.h
@@ -109,7 +109,7 @@ struct nlm_file {
109 struct nfs_fh f_handle; /* NFS file handle */ 109 struct nfs_fh f_handle; /* NFS file handle */
110 struct file * f_file; /* VFS file pointer */ 110 struct file * f_file; /* VFS file pointer */
111 struct nlm_share * f_shares; /* DOS shares */ 111 struct nlm_share * f_shares; /* DOS shares */
112 struct nlm_block * f_blocks; /* blocked locks */ 112 struct list_head f_blocks; /* blocked locks */
113 unsigned int f_locks; /* guesstimate # of locks */ 113 unsigned int f_locks; /* guesstimate # of locks */
114 unsigned int f_count; /* reference count */ 114 unsigned int f_count; /* reference count */
115 struct semaphore f_sema; /* avoid concurrent access */ 115 struct semaphore f_sema; /* avoid concurrent access */
@@ -123,14 +123,13 @@ struct nlm_file {
123#define NLM_NEVER (~(unsigned long) 0) 123#define NLM_NEVER (~(unsigned long) 0)
124struct nlm_block { 124struct nlm_block {
125 struct kref b_count; /* Reference count */ 125 struct kref b_count; /* Reference count */
126 struct nlm_block * b_next; /* linked list (all blocks) */ 126 struct list_head b_list; /* linked list of all blocks */
127 struct nlm_block * b_fnext; /* linked list (per file) */ 127 struct list_head b_flist; /* linked list (per file) */
128 struct nlm_rqst * b_call; /* RPC args & callback info */ 128 struct nlm_rqst * b_call; /* RPC args & callback info */
129 struct svc_serv * b_daemon; /* NLM service */ 129 struct svc_serv * b_daemon; /* NLM service */
130 struct nlm_host * b_host; /* host handle for RPC clnt */ 130 struct nlm_host * b_host; /* host handle for RPC clnt */
131 unsigned long b_when; /* next re-xmit */ 131 unsigned long b_when; /* next re-xmit */
132 unsigned int b_id; /* block id */ 132 unsigned int b_id; /* block id */
133 unsigned char b_queued; /* re-queued */
134 unsigned char b_granted; /* VFS granted lock */ 133 unsigned char b_granted; /* VFS granted lock */
135 struct nlm_file * b_file; /* file in question */ 134 struct nlm_file * b_file; /* file in question */
136}; 135};