]> err.no Git - linux-2.6/commitdiff
[PATCH] Remove warning: VFS is out of sync with lock manager
authorNeil Brown <neilb@suse.de>
Tue, 30 Jan 2007 22:36:01 +0000 (14:36 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Wed, 31 Jan 2007 00:01:35 +0000 (16:01 -0800)
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>
fs/nfs/file.c

index fab20d06d936c4d537712b1d22b5e1f33c676629..9e4a2b70995a2fc1694b5d34cbb23d88d98c1e15 100644 (file)
@@ -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;
 }