Make it a little more clear that this is the default implemenation for
the setleast operation.
Signed-off-by: Christoph Hellwig <hch@xxxxxx>
Index: linux-2.6/fs/gfs2/ops_file.c
===================================================================
--- linux-2.6.orig/fs/gfs2/ops_file.c 2007-07-19 21:54:53.000000000 +0200
+++ linux-2.6/fs/gfs2/ops_file.c 2007-07-19 22:10:33.000000000 +0200
@@ -508,7 +508,7 @@ static int gfs2_setlease(struct file *fi
*/
if (!sdp->sd_args.ar_localflocks)
return -EINVAL;
- return setlease(file, arg, fl);
+ return generic_setlease(file, arg, fl);
}
/**
Index: linux-2.6/fs/locks.c
===================================================================
--- linux-2.6.orig/fs/locks.c 2007-07-19 21:54:54.000000000 +0200
+++ linux-2.6/fs/locks.c 2007-07-19 22:15:13.000000000 +0200
@@ -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
* @arg: type of lease to obtain
* @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.
*/
-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 dentry *dentry = filp->f_path.dentry;
@@ -1419,7 +1419,7 @@ int setlease(struct file *filp, long arg
out:
return error;
}
-EXPORT_SYMBOL(setlease);
+EXPORT_SYMBOL(generic_setlease);
/**
* vfs_setlease - sets a lease on an open file
@@ -1456,7 +1456,7 @@ int vfs_setlease(struct file *filp, long
if (filp->f_op && filp->f_op->setlease)
error = filp->f_op->setlease(filp, arg, lease);
else
- error = setlease(filp, arg, lease);
+ error = generic_setlease(filp, arg, lease);
unlock_kernel();
return error;
Index: linux-2.6/include/linux/fs.h
===================================================================
--- linux-2.6.orig/include/linux/fs.h 2007-07-19 21:54:53.000000000 +0200
+++ linux-2.6/include/linux/fs.h 2007-07-19 22:10:33.000000000 +0200
@@ -878,7 +878,7 @@ extern int vfs_cancel_lock(struct file *
extern int flock_lock_file_wait(struct file *filp, struct file_lock *fl);
extern int __break_lease(struct inode *inode, unsigned int flags);
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 lease_modify(struct file_lock **, int);
extern int lock_may_read(struct inode *, loff_t start, unsigned long count);
-
To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
