summaryrefslogtreecommitdiff
path: root/fs/nfs/file.c
diff options
context:
space:
mode:
authorNeil Brown <neilb@suse.de>2007-01-30 14:36:01 -0800
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-01-30 16:01:35 -0800
commit46bae1a9a767f3ae8e636d96f9b95703df34b398 (patch)
treeb07f821219bfb9ea4c17180bf6635cf14bdba9b3 /fs/nfs/file.c
parentec268be36e79d99443efc4be3a617d6efc6f719b (diff)
downloadlwn-46bae1a9a767f3ae8e636d96f9b95703df34b398.tar.gz
lwn-46bae1a9a767f3ae8e636d96f9b95703df34b398.zip
[PATCH] Remove warning: VFS is out of sync with lock manager
But keep it as a dprintk The message can be generated in a quite normal situation: If a 'lock' request is interrupted, then the lock client needs to record that the server has the lock, incase it does. When we come the unlock, the server might say it doesn't, even though we think it does (or might) and this generates the message. Signed-off-by: Neil Brown <neilb@suse.de> Acked-by: Trond Myklebust <trond.myklebust@fys.uio.no> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs/nfs/file.c')
-rw-r--r--fs/nfs/file.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/fs/nfs/file.c b/fs/nfs/file.c
index fab20d06d936..9e4a2b70995a 100644
--- a/fs/nfs/file.c
+++ b/fs/nfs/file.c
@@ -434,8 +434,9 @@ static int do_vfs_lock(struct file *file, struct file_lock *fl)
BUG();
}
if (res < 0)
- printk(KERN_WARNING "%s: VFS is out of sync with lock manager!\n",
- __FUNCTION__);
+ dprintk(KERN_WARNING "%s: VFS is out of sync with lock manager"
+ " - error %d!\n",
+ __FUNCTION__, res);
return res;
}