diff --git a/[refs] b/[refs]
index 2992e050e09e..10fa474f40af 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5a4f13fad1ab5bd08dea78fc55321e429d83cddf
+refs/heads/master: f7c2df9b55212d5ec94169a4de11e44c683e0af4
diff --git a/trunk/fs/afs/flock.c b/trunk/fs/afs/flock.c
index 210acafe4a9b..3ff8bdd18fb3 100644
--- a/trunk/fs/afs/flock.c
+++ b/trunk/fs/afs/flock.c
@@ -432,7 +432,6 @@ static int afs_do_setlk(struct file *file, struct file_lock *fl)
 	list_del_init(&fl->fl_u.afs.link);
 	if (list_empty(&vnode->granted_locks))
 		afs_defer_unlock(vnode, key);
-	spin_unlock(&vnode->lock);
 	goto abort_attempt;
 }