---

yaml --- r: 323229 b: refs/heads/master c: c5aa1e5 h: refs/heads/master i: 323227: b58f64d v: v3
git-mirror · Sep 23, 2012 · 5272abb · 5272abb
1 parent 051da29
commit 5272abb
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 156cacb1d0d36b0d0582d9e798e58e0044f516b3
+refs/heads/master: c5aa1e554a20fb3542c62688ae46049c9225a965
diff --git a/trunk/fs/lockd/svclock.c b/trunk/fs/lockd/svclock.c
@@ -289,7 +289,6 @@ static void nlmsvc_free_block(struct kref *kref)
 	dprintk("lockd: freeing block %p...\n", block);
 
 	/* Remove block from file's list of blocks */
-	mutex_lock(&file->f_mutex);
 	list_del_init(&block->b_flist);
 	mutex_unlock(&file->f_mutex);
 
@@ -303,7 +302,7 @@ static void nlmsvc_free_block(struct kref *kref)
 static void nlmsvc_release_block(struct nlm_block *block)
 {
 	if (block != NULL)
-		kref_put(&block->b_count, nlmsvc_free_block);
+		kref_put_mutex(&block->b_count, nlmsvc_free_block, &block->b_file->f_mutex);
 }
 
 /*