summaryrefslogtreecommitdiffstats
path: root/fs/nfs/file.c
diff options
context:
space:
mode:
authorFabio Olive Leite <fleite@redhat.com>2010-09-13 01:55:25 +0200
committerTrond Myklebust <Trond.Myklebust@netapp.com>2010-09-13 01:55:25 +0200
commitb1bde04c6d9a120dec602cc8a70b8a7f21600883 (patch)
tree2d2a53e0978e3f8e3d320260dc78bbbbbe749651 /fs/nfs/file.c
parentSUNRPC: cleanup state-machine ordering (diff)
downloadlinux-b1bde04c6d9a120dec602cc8a70b8a7f21600883.tar.xz
linux-b1bde04c6d9a120dec602cc8a70b8a7f21600883.zip
Remove incorrect do_vfs_lock message
The do_vfs_lock function on fs/nfs/file.c is only called if NLM is not being used, via the -onolock mount option. Therefore it cannot really be "out of sync with lock manager" when the local locking function called returns an error, as there will be no corresponding call to the NLM. For details, simply check the if/else on do_setlk and do_unlk on fs/nfs/file.c. Signed-Off-By: Fabio Olive Leite <fleite@redhat.com> Reviewed-by: Jeff Layton <jlayton@redhat.com> Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to '')
-rw-r--r--fs/nfs/file.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/fs/nfs/file.c b/fs/nfs/file.c
index eb51bd6201da..05bf3c0dc751 100644
--- a/fs/nfs/file.c
+++ b/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;
}