patch-2.4.0-test9 linux/fs/lockd/svclock.c

• Lines: 18
• Date: Thu Sep 21 13:38:58 2000
• Orig file: v2.4.0-test8/linux/fs/lockd/svclock.c
• Orig date: Thu Jun 29 14:06:47 2000

diff -u --recursive --new-file v2.4.0-test8/linux/fs/lockd/svclock.c linux/fs/lockd/svclock.c
@@ -170,6 +170,8 @@
 	if (!(block = (struct nlm_block *) kmalloc(sizeof(*block), GFP_KERNEL)))
 		goto failed;
 	memset(block, 0, sizeof(*block));
+	locks_init_lock(&block->b_call.a_args.lock.fl);
+	locks_init_lock(&block->b_call.a_res.lock.fl);
 
 	/* Set notifier function for VFS, and init args */
 	lock->fl.fl_notify = nlmsvc_notify_blocked;
@@ -347,7 +349,7 @@
 	/* Append to list of blocked */
 	nlmsvc_insert_block(block, NLM_NEVER);
 
-	if (!list_empty(&block->b_call.a_args.lock.fl.fl_block)) {
+	if (list_empty(&block->b_call.a_args.lock.fl.fl_list)) {
 		/* Now add block to block list of the conflicting lock
 		   if we haven't done so. */
 		dprintk("lockd: blocking on this lock.\n");