patch-2.3.1 linux/fs/lockd/clntlock.c

Next file: linux/fs/lockd/host.c
Previous file: linux/fs/isofs/inode.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.3.0/linux/fs/lockd/clntlock.c linux/fs/lockd/clntlock.c
@@ -34,7 +34,7 @@
  */
 struct nlm_wait {
 	struct nlm_wait *	b_next;		/* linked list */
-	struct wait_queue *	b_wait;		/* where to wait on */
+	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 */
@@ -55,7 +55,7 @@
 
 	block.b_host   = host;
 	block.b_lock   = fl;
-	block.b_wait   = NULL;
+	init_waitqueue_head(&block.b_wait);
 	block.b_status = NLM_LCK_BLOCKED;
 	block.b_next   = nlm_blocked;
 	nlm_blocked    = █

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)