--- linux-2.6.22.orig/fs/lockd/svclock.c	2007-07-08 19:32:17.000000000 -0400
+++ linux-2.6.22/fs/lockd/svclock.c	2007-11-25 03:09:46.000000000 -0500
@@ -492,7 +498,8 @@
 			block, block->b_flags, block->b_fl);
 		if (block->b_flags & B_TIMED_OUT) {
 			nlmsvc_unlink_block(block);
-			return nlm_lck_denied;
+			ret = nlm_lck_denied;
+                        goto out;
 		}
 		if (block->b_flags & B_GOT_CALLBACK) {
 			if (block->b_fl != NULL
@@ -502,15 +509,19 @@
 			}
 			else {
 				nlmsvc_unlink_block(block);
-				return nlm_granted;
+				ret = nlm_granted;
+                                goto out;
 			}
 		}
-		return nlm_drop_reply;
+		ret = nlm_drop_reply;
+                goto out;
 	}
 
 	error = vfs_test_lock(file->f_file, &lock->fl);
-	if (error == -EINPROGRESS)
-		return nlmsvc_defer_lock_rqst(rqstp, block);
+	if (error == -EINPROGRESS) {
+		ret = nlmsvc_defer_lock_rqst(rqstp, block);
+                goto out;
+        }
 	if (error) {
 		ret = nlm_lck_denied_nolocks;
 		goto out;