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

Commit e6f5c789 authored by Jeff Layton's avatar Jeff Layton
Browse files

locks: plumb a "priv" pointer into the setlease routines 



In later patches, we're going to add a new lock_manager_operation to
finish setting up the lease while still holding the i_lock.  To do
this, we'll need to pass a little bit of info in the fcntl setlease
case (primarily an fasync structure). Plumb the extra pointer into
there in advance of that.

We declare this pointer as a void ** to make it clear that this is
private info, and that the caller isn't required to set this unless
the lm_setup specifically requires it.

Signed-off-by: default avatarJeff Layton <jlayton@primarydata.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
parent 0c637be8

Documentation/filesystems/Locking

+1 −1
Original line number Diff line number Diff line
@@ -464,7 +464,7 @@ prototypes: 
			size_t, unsigned int);

	ssize_t (*splice_read)(struct file *, loff_t *, struct pipe_inode_info *,

			size_t, unsigned int);

	int (*setlease)(struct file *, long, struct file_lock **);

	int (*setlease)(struct file *, long, struct file_lock **, void **);

	long (*fallocate)(struct file *, int, loff_t, loff_t);

};

Documentation/filesystems/vfs.txt

+1 −1
Original line number Diff line number Diff line
@@ -826,7 +826,7 @@ struct file_operations { 
	int (*flock) (struct file *, int, struct file_lock *);

	ssize_t (*splice_write)(struct pipe_inode_info *, struct file *, size_t, unsigned int);

	ssize_t (*splice_read)(struct file *, struct pipe_inode_info *, size_t, unsigned int);

	int (*setlease)(struct file *, long arg, struct file_lock **);

	int (*setlease)(struct file *, long arg, struct file_lock **, void **);

	long (*fallocate)(struct file *, int mode, loff_t offset, loff_t len);

	int (*show_fdinfo)(struct seq_file *m, struct file *f);

};

fs/cifs/cifsfs.c

+4 −3
Original line number Diff line number Diff line
@@ -800,7 +800,8 @@ static loff_t cifs_llseek(struct file *file, loff_t offset, int whence) 
	return generic_file_llseek(file, offset, whence);

}



static int cifs_setlease(struct file *file, long arg, struct file_lock **lease)

static int

cifs_setlease(struct file *file, long arg, struct file_lock **lease, void **priv)

{

	/*

	 * Note that this is called by vfs setlease with i_lock held to
@@ -815,7 +816,7 @@ static int cifs_setlease(struct file *file, long arg, struct file_lock **lease) 
	/* check if file is oplocked */

	if (((arg == F_RDLCK) && CIFS_CACHE_READ(CIFS_I(inode))) ||

	    ((arg == F_WRLCK) && CIFS_CACHE_WRITE(CIFS_I(inode))))

		return generic_setlease(file, arg, lease);

		return generic_setlease(file, arg, lease, priv);

	else if (tlink_tcon(cfile->tlink)->local_lease &&

		 !CIFS_CACHE_READ(CIFS_I(inode)))

		/*
@@ -826,7 +827,7 @@ 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);

		return generic_setlease(file, arg, lease, priv);

	else

		return -EAGAIN;

}

fs/libfs.c

+3 −1
Original line number Diff line number Diff line
@@ -1081,12 +1081,14 @@ EXPORT_SYMBOL(alloc_anon_inode); 
 * @filp: file pointer

 * @arg: type of lease to obtain

 * @flp: new lease supplied for insertion

 * @priv: private data for lm_setup operation

 *

 * Generic helper for filesystems that do not wish to allow leases to be set.

 * All arguments are ignored and it just returns -EINVAL.

 */

int

simple_nosetlease(struct file *filp, long arg, struct file_lock **flp)

simple_nosetlease(struct file *filp, long arg, struct file_lock **flp,

		  void **priv)

{

	return -EINVAL;

}

fs/locks.c

+20 −12
Original line number Diff line number Diff line
@@ -1297,7 +1297,6 @@ int lease_modify(struct file_lock **before, int arg) 
	}

	return 0;

}



EXPORT_SYMBOL(lease_modify);



static bool past_time(unsigned long then)
@@ -1543,7 +1542,8 @@ check_conflicting_open(const struct dentry *dentry, const long arg) 
	return ret;

}



static int generic_add_lease(struct file *filp, long arg, struct file_lock **flp)

static int

generic_add_lease(struct file *filp, long arg, struct file_lock **flp, void **priv)

{

	struct file_lock *fl, **before, **my_before = NULL, *lease;

	struct dentry *dentry = filp->f_path.dentry;
@@ -1630,11 +1630,14 @@ static int generic_add_lease(struct file *filp, long arg, struct file_lock **flp 
	smp_mb();

	error = check_conflicting_open(dentry, arg);

	if (error)

		locks_unlink_lock(before);

		goto out_unlink;

out:

	if (is_deleg)

		mutex_unlock(&inode->i_mutex);

	return error;

out_unlink:

	locks_unlink_lock(before);

	goto out;

}



static int generic_delete_lease(struct file *filp)
@@ -1661,13 +1664,15 @@ static int generic_delete_lease(struct file *filp) 
 *	@filp: file pointer

 *	@arg: type of lease to obtain

 *	@flp: input - file_lock to use, output - file_lock inserted

 *	@priv: private data for lm_setup

 *

 *	The (input) flp->fl_lmops->lm_break function is required

 *	by break_lease().

 *

 *	Called with inode->i_lock held.

 */

int generic_setlease(struct file *filp, long arg, struct file_lock **flp)

int generic_setlease(struct file *filp, long arg, struct file_lock **flp,

			void **priv)

{

	struct dentry *dentry = filp->f_path.dentry;

	struct inode *inode = dentry->d_inode;
@@ -1692,19 +1697,20 @@ int generic_setlease(struct file *filp, long arg, struct file_lock **flp) 
			WARN_ON_ONCE(1);

			return -ENOLCK;

		}

		return generic_add_lease(filp, arg, flp);

		return generic_add_lease(filp, arg, flp, priv);

	default:

		return -EINVAL;

	}

}

EXPORT_SYMBOL(generic_setlease);



static int __vfs_setlease(struct file *filp, long arg, struct file_lock **lease)

static int

__vfs_setlease(struct file *filp, long arg, struct file_lock **lease, void **priv)

{

	if (filp->f_op->setlease)

		return filp->f_op->setlease(filp, arg, lease);

		return filp->f_op->setlease(filp, arg, lease, priv);

	else

		return generic_setlease(filp, arg, lease);

		return generic_setlease(filp, arg, lease, priv);

}



/**
@@ -1712,6 +1718,7 @@ static int __vfs_setlease(struct file *filp, long arg, struct file_lock **lease) 
 * @filp: file pointer

 * @arg: type of lease to obtain

 * @lease: file_lock to use when adding a lease

 * @priv: private info for lm_setup when adding a lease

 *

 * Call this to establish a lease on the file. The "lease" argument is not

 * used for F_UNLCK requests and may be NULL. For commands that set or alter
@@ -1720,13 +1727,14 @@ static int __vfs_setlease(struct file *filp, long arg, struct file_lock **lease) 
 * stack trace).

 */



int vfs_setlease(struct file *filp, long arg, struct file_lock **lease)

int

vfs_setlease(struct file *filp, long arg, struct file_lock **lease, void **priv)

{

	struct inode *inode = file_inode(filp);

	int error;



	spin_lock(&inode->i_lock);

	error = __vfs_setlease(filp, arg, lease);

	error = __vfs_setlease(filp, arg, lease, priv);

	spin_unlock(&inode->i_lock);



	return error;
@@ -1751,7 +1759,7 @@ static int do_fcntl_add_lease(unsigned int fd, struct file *filp, long arg) 
	}

	ret = fl;

	spin_lock(&inode->i_lock);

	error = __vfs_setlease(filp, arg, &ret);

	error = __vfs_setlease(filp, arg, &ret, NULL);

	if (error)

		goto out_unlock;

	if (ret == fl)
@@ -1789,7 +1797,7 @@ static int do_fcntl_add_lease(unsigned int fd, struct file *filp, long arg) 
int fcntl_setlease(unsigned int fd, struct file *filp, long arg)

{

	if (arg == F_UNLCK)

		return vfs_setlease(filp, F_UNLCK, NULL);

		return vfs_setlease(filp, F_UNLCK, NULL, NULL);

	return do_fcntl_add_lease(fd, filp, arg);

}