aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--fs/gfs2/ops_file.c2
-rw-r--r--fs/locks.c8
-rw-r--r--include/linux/fs.h2
3 files changed, 6 insertions, 6 deletions
diff --git a/fs/gfs2/ops_file.c b/fs/gfs2/ops_file.c
index 1a5e8e893d75..773421130116 100644
--- a/fs/gfs2/ops_file.c
+++ b/fs/gfs2/ops_file.c
@@ -508,7 +508,7 @@ static int gfs2_setlease(struct file *file, long arg, struct file_lock **fl)
508 */ 508 */
509 if (!sdp->sd_args.ar_localflocks) 509 if (!sdp->sd_args.ar_localflocks)
510 return -EINVAL; 510 return -EINVAL;
511 return setlease(file, arg, fl); 511 return generic_setlease(file, arg, fl);
512} 512}
513 513
514/** 514/**
diff --git a/fs/locks.c b/fs/locks.c
index 310510637247..50857d2d3404 100644
--- a/fs/locks.c
+++ b/fs/locks.c
@@ -1324,7 +1324,7 @@ int fcntl_getlease(struct file *filp)
1324} 1324}
1325 1325
1326/** 1326/**
1327 * setlease - sets a lease on an open file 1327 * generic_setlease - sets a lease on an open file
1328 * @filp: file pointer 1328 * @filp: file pointer
1329 * @arg: type of lease to obtain 1329 * @arg: type of lease to obtain
1330 * @flp: input - file_lock to use, output - file_lock inserted 1330 * @flp: input - file_lock to use, output - file_lock inserted
@@ -1334,7 +1334,7 @@ int fcntl_getlease(struct file *filp)
1334 * 1334 *
1335 * Called with kernel lock held. 1335 * Called with kernel lock held.
1336 */ 1336 */
1337int setlease(struct file *filp, long arg, struct file_lock **flp) 1337int generic_setlease(struct file *filp, long arg, struct file_lock **flp)
1338{ 1338{
1339 struct file_lock *fl, **before, **my_before = NULL, *lease; 1339 struct file_lock *fl, **before, **my_before = NULL, *lease;
1340 struct dentry *dentry = filp->f_path.dentry; 1340 struct dentry *dentry = filp->f_path.dentry;
@@ -1419,7 +1419,7 @@ int setlease(struct file *filp, long arg, struct file_lock **flp)
1419out: 1419out:
1420 return error; 1420 return error;
1421} 1421}
1422EXPORT_SYMBOL(setlease); 1422EXPORT_SYMBOL(generic_setlease);
1423 1423
1424 /** 1424 /**
1425 * vfs_setlease - sets a lease on an open file 1425 * 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)
1456 if (filp->f_op && filp->f_op->setlease) 1456 if (filp->f_op && filp->f_op->setlease)
1457 error = filp->f_op->setlease(filp, arg, lease); 1457 error = filp->f_op->setlease(filp, arg, lease);
1458 else 1458 else
1459 error = setlease(filp, arg, lease); 1459 error = generic_setlease(filp, arg, lease);
1460 unlock_kernel(); 1460 unlock_kernel();
1461 1461
1462 return error; 1462 return error;
diff --git a/include/linux/fs.h b/include/linux/fs.h
index d33beadd9a43..6bf139562947 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -878,7 +878,7 @@ extern int vfs_cancel_lock(struct file *filp, struct file_lock *fl);
878extern int flock_lock_file_wait(struct file *filp, struct file_lock *fl); 878extern int flock_lock_file_wait(struct file *filp, struct file_lock *fl);
879extern int __break_lease(struct inode *inode, unsigned int flags); 879extern int __break_lease(struct inode *inode, unsigned int flags);
880extern void lease_get_mtime(struct inode *, struct timespec *time); 880extern void lease_get_mtime(struct inode *, struct timespec *time);
881extern int setlease(struct file *, long, struct file_lock **); 881extern int generic_setlease(struct file *, long, struct file_lock **);
882extern int vfs_setlease(struct file *, long, struct file_lock **); 882extern int vfs_setlease(struct file *, long, struct file_lock **);
883extern int lease_modify(struct file_lock **, int); 883extern int lease_modify(struct file_lock **, int);
884extern int lock_may_read(struct inode *, loff_t start, unsigned long count); 884extern int lock_may_read(struct inode *, loff_t start, unsigned long count);