adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-29 04:06:22 +00:00
Code Issues Projects Releases Packages Wiki Activity

rename setlease to generic_setlease

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

Signed-off-by: Christoph Hellwig <hch@lst.de>
Cc: Steven Whitehouse <swhiteho@redhat.com>
Acked-by: "J. Bruce Fields" <bfields@fieldses.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Christoph Hellwig 2007-07-31 00:39:22 -07:00 committed by Linus Torvalds
parent 86d0004abc
commit 0af1a45046
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
fs/gfs2/ops_file.c
View file

@ -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);
} }
/** /**

8
fs/locks.c
View file

@ -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;

2
include/linux/fs.h
View file

@ -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);