summaryrefslogtreecommitdiffstats
path: root/fs
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
parent096657b65e1ac197e20be5ce7cff6b6ca2532787 (diff)
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')
-rw-r--r--fs/cifs/cifsfs.c5
-rw-r--r--fs/gfs2/file.c2
-rw-r--r--fs/locks.c3
-rw-r--r--fs/nfs/file.c3
4 files changed, 10 insertions, 3 deletions
diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c
index 75c4eaa7958..54745b6c3db 100644
--- a/fs/cifs/cifsfs.c
+++ b/fs/cifs/cifsfs.c
@@ -625,8 +625,11 @@ static int cifs_setlease(struct file *file, long arg, struct file_lock **lease)
knows that the file won't be changed on the server
by anyone else */
return generic_setlease(file, arg, lease);
- else
+ else {
+ if (arg != F_UNLCK)
+ locks_free_lock(*lease);
return -EAGAIN;
+ }
}
struct file_system_type cifs_fs_type = {
diff --git a/fs/gfs2/file.c b/fs/gfs2/file.c
index aa996471ec5..ac943c1307b 100644
--- a/fs/gfs2/file.c
+++ b/fs/gfs2/file.c
@@ -629,6 +629,8 @@ static ssize_t gfs2_file_aio_write(struct kiocb *iocb, const struct iovec *iov,
static int gfs2_setlease(struct file *file, long arg, struct file_lock **fl)
{
+ if (arg != F_UNLCK)
+ locks_free_lock(*fl);
return -EINVAL;
}
diff --git a/fs/locks.c b/fs/locks.c
index 63fbc41cc57..5b526a97788 100644
--- a/fs/locks.c
+++ b/fs/locks.c
@@ -186,7 +186,7 @@ void locks_release_private(struct file_lock *fl)
EXPORT_SYMBOL_GPL(locks_release_private);
/* Free a lock which is not in use. */
-static void locks_free_lock(struct file_lock *fl)
+void locks_free_lock(struct file_lock *fl)
{
BUG_ON(waitqueue_active(&fl->fl_wait));
BUG_ON(!list_empty(&fl->fl_block));
@@ -195,6 +195,7 @@ static void locks_free_lock(struct file_lock *fl)
locks_release_private(fl);
kmem_cache_free(filelock_cache, fl);
}
+EXPORT_SYMBOL(locks_free_lock);
void locks_init_lock(struct file_lock *fl)
{
diff --git a/fs/nfs/file.c b/fs/nfs/file.c
index e756075637b..1e524fb73ba 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;
}