diff --git a/[refs] b/[refs]
index 9c34c58ed39e..98551a652b64 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 55576244eba805307a2b2b6a145b8f85f8c7c124
+refs/heads/master: b1bde04c6d9a120dec602cc8a70b8a7f21600883
diff --git a/trunk/fs/nfs/file.c b/trunk/fs/nfs/file.c
index eb51bd6201da..05bf3c0dc751 100644
--- a/trunk/fs/nfs/file.c
+++ b/trunk/fs/nfs/file.c
@@ -723,10 +723,6 @@ static int do_vfs_lock(struct file *file, struct file_lock *fl)
 		default:
 			BUG();
 	}
-	if (res < 0)
-		dprintk(KERN_WARNING "%s: VFS is out of sync with lock manager"
-			" - error %d!\n",
-				__func__, res);
 	return res;
 }