summaryrefslogtreecommitdiffstats
path: root/fs/nfs
diff options
context:
space:
mode:
authorJ. Bruce Fields <bfields@redhat.com>2010-10-30 17:31:15 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2010-10-30 18:08:15 -0700
commit05fa3135fdc7b9b510b502a35b6b97d2b38c6f48 (patch)
treed533e8112111202ae890b2061c0386669002d080 /fs/nfs
parent096657b65e1ac197e20be5ce7cff6b6ca2532787 (diff)
downloadop-kernel-dev-05fa3135fdc7b9b510b502a35b6b97d2b38c6f48.zip
op-kernel-dev-05fa3135fdc7b9b510b502a35b6b97d2b38c6f48.tar.gz
locks: fix setlease methods to free passed-in lock
We modified setlease to require the caller to allocate the new lease in the case of creating a new lease, but forgot to fix up the filesystem methods. Cc: Steven Whitehouse <swhiteho@redhat.com> Cc: Steve French <sfrench@samba.org> Cc: Trond Myklebust <Trond.Myklebust@netapp.com> Signed-off-by: J. Bruce Fields <bfields@redhat.com> Acked-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs/nfs')
-rw-r--r--fs/nfs/file.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/nfs/file.c b/fs/nfs/file.c
index e756075..1e524fb 100644
--- a/fs/nfs/file.c
+++ b/fs/nfs/file.c
@@ -884,6 +884,7 @@ static int nfs_setlease(struct file *file, long arg, struct file_lock **fl)
dprintk("NFS: setlease(%s/%s, arg=%ld)\n",
file->f_path.dentry->d_parent->d_name.name,
file->f_path.dentry->d_name.name, arg);
-
+ if (arg != F_UNLCK)
+ locks_free_lock(*fl);
return -EINVAL;
}
OpenPOWER on IntegriCloud