locks: let the caller free file_lock on ->setlease failure
authorChristoph Hellwig <hch@infradead.org>
Sun, 31 Oct 2010 12:35:10 +0000 (08:35 -0400)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 31 Oct 2010 13:35:15 +0000 (06:35 -0700)
commit51ee4b84f5c86935b438d6636f34b523edb415a8
treec60e0da8f8b6393477d79ef6d6ce321ee3b8ecaa
parent96f935934591b72f5b05fd6923bc8cdcae92f2e5
locks: let the caller free file_lock on ->setlease failure

The caller allocated it, the caller should free it.

The only issue so far is that we could change the flp pointer even on an
error return if the fl_change callback failed.  But we can simply move
the flp assignment after the fl_change invocation, as the callers don't
care about the flp return value if the setlease call failed.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
fs/cifs/cifsfs.c
fs/gfs2/file.c
fs/locks.c
fs/nfs/file.c
fs/nfsd/nfs4state.c