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

Commit 0af1a450 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Linus Torvalds
Browse files

rename setlease to generic_setlease 



Make it a little more clear that this is the default implementation for
the setleast operation.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Cc: Steven Whitehouse <swhiteho@redhat.com>
Acked-by: default avatar"J. Bruce Fields" <bfields@fieldses.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 86d0004a

fs/gfs2/ops_file.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -508,7 +508,7 @@ static int gfs2_setlease(struct file *file, long arg, struct file_lock **fl) 
	 */

	 */

	if (!sdp->sd_args.ar_localflocks)

	if (!sdp->sd_args.ar_localflocks)

		return -EINVAL;

		return -EINVAL;

	return setlease(file, arg, fl);

	return generic_setlease(file, arg, fl);

}

}





/**

/**

fs/locks.c

+4 −4
Original line number Original line Diff line number Diff line
@@ -1324,7 +1324,7 @@ int fcntl_getlease(struct file *filp) 
}

}





/**

/**

 *	setlease	-	sets a lease on an open file

 *	generic_setlease	-	sets a lease on an open file

 *	@filp: file pointer

 *	@filp: file pointer

 *	@arg: type of lease to obtain

 *	@arg: type of lease to obtain

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

 *	@flp: input - file_lock to use, output - file_lock inserted
@@ -1334,7 +1334,7 @@ int fcntl_getlease(struct file *filp) 
 *

 *

 *	Called with kernel lock held.

 *	Called with kernel lock held.

 */

 */

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

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

{

{

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

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

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

	struct dentry *dentry = filp->f_path.dentry;
@@ -1419,7 +1419,7 @@ int setlease(struct file *filp, long arg, struct file_lock **flp) 
out:

out:

	return error;

	return error;

}

}

EXPORT_SYMBOL(setlease);

EXPORT_SYMBOL(generic_setlease);





 /**

 /**

 *	vfs_setlease        -       sets a lease on an open file

 *	vfs_setlease        -       sets a lease on an open file
@@ -1456,7 +1456,7 @@ int vfs_setlease(struct file *filp, long arg, struct file_lock **lease) 
	if (filp->f_op && filp->f_op->setlease)

	if (filp->f_op && filp->f_op->setlease)

		error = filp->f_op->setlease(filp, arg, lease);

		error = filp->f_op->setlease(filp, arg, lease);

	else

	else

		error = setlease(filp, arg, lease);

		error = generic_setlease(filp, arg, lease);

	unlock_kernel();

	unlock_kernel();





	return error;

	return error;

include/linux/fs.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -878,7 +878,7 @@ extern int vfs_cancel_lock(struct file *filp, struct file_lock *fl); 
extern int flock_lock_file_wait(struct file *filp, struct file_lock *fl);

extern int flock_lock_file_wait(struct file *filp, struct file_lock *fl);

extern int __break_lease(struct inode *inode, unsigned int flags);

extern int __break_lease(struct inode *inode, unsigned int flags);

extern void lease_get_mtime(struct inode *, struct timespec *time);

extern void lease_get_mtime(struct inode *, struct timespec *time);

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

extern int generic_setlease(struct file *, long, struct file_lock **);

extern int vfs_setlease(struct file *, long, struct file_lock **);

extern int vfs_setlease(struct file *, long, struct file_lock **);

extern int lease_modify(struct file_lock **, int);

extern int lease_modify(struct file_lock **, int);

extern int lock_may_read(struct inode *, loff_t start, unsigned long count);

extern int lock_may_read(struct inode *, loff_t start, unsigned long count);