diff --git a/[refs] b/[refs]
index f61561c99eea..08e9216b9787 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8838dc43d6544570e8969a74ddc4a0d21abffde6
+refs/heads/master: 54ca95eb362d6988a577965ffb77c08702adb890
diff --git a/trunk/fs/lockd/svclock.c b/trunk/fs/lockd/svclock.c
index 84c4d5e04ebb..2f4d8fa66689 100644
--- a/trunk/fs/lockd/svclock.c
+++ b/trunk/fs/lockd/svclock.c
@@ -505,12 +505,12 @@ nlmsvc_testlock(struct svc_rqst *rqstp, struct nlm_file *file,
 			goto out;
 		}
 		if (block->b_flags & B_GOT_CALLBACK) {
+			nlmsvc_unlink_block(block);
 			if (block->b_fl != NULL
 					&& block->b_fl->fl_type != F_UNLCK) {
 				lock->fl = *block->b_fl;
 				goto conf_lock;
 			} else {
-				nlmsvc_unlink_block(block);
 				ret = nlm_granted;
 				goto out;
 			}