Commit b1bde04c authored Sep 12, 2010 by Fabio Olive Leite Committed by Trond Myklebust Sep 12, 2010

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>

parent 55576244

fs/nfs/file.c

+0 −4

Original line number	Diff line number	Diff line
		@@ -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;
		}

Admin message