diff options
author | Christoph Hellwig <hch@lst.de> | 2007-07-31 03:39:22 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-31 18:39:43 -0400 |
commit | 0af1a4504699524c876361845bc2e301ecc45d0f (patch) | |
tree | 72c6d1ac9d7dfb44d25c58eea599c2df63aa2562 /fs | |
parent | 86d0004abc87025bae1cca43c94e99a27b7bbbd6 (diff) |
rename setlease to generic_setlease
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>
Diffstat (limited to 'fs')
-rw-r--r-- | fs/gfs2/ops_file.c | 2 | ||||
-rw-r--r-- | fs/locks.c | 8 |
2 files changed, 5 insertions, 5 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 | */ |
1337 | int setlease(struct file *filp, long arg, struct file_lock **flp) | 1337 | int 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) | |||
1419 | out: | 1419 | out: |
1420 | return error; | 1420 | return error; |
1421 | } | 1421 | } |
1422 | EXPORT_SYMBOL(setlease); | 1422 | EXPORT_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; |