Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 05fa3135 authored by J. Bruce Fields's avatar J. Bruce Fields Committed by Linus Torvalds
Browse files

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: default avatarJ. Bruce Fields <bfields@redhat.com>
Acked-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 096657b6

fs/cifs/cifsfs.c

+4 −1
Original line number Diff line number Diff line
@@ -625,9 +625,12 @@ 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 = {

	.owner = THIS_MODULE,

fs/gfs2/file.c

+2 −0
Original line number Diff line number Diff line
@@ -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;

}

fs/locks.c

+2 −1
Original line number Diff line number Diff line
@@ -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)

{

fs/nfs/file.c

+2 −1
Original line number Diff line number Diff line
@@ -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;

}

include/linux/fs.h

+1 −0
Original line number Diff line number Diff line
@@ -1129,6 +1129,7 @@ extern int fcntl_setlease(unsigned int fd, struct file *filp, long arg); 
extern int fcntl_getlease(struct file *filp);



/* fs/locks.c */

void locks_free_lock(struct file_lock *fl);

extern void locks_init_lock(struct file_lock *);

extern struct file_lock * locks_alloc_lock(void);

extern void locks_copy_lock(struct file_lock *, struct file_lock *);