From bda78fc115ceb0cf8813f588b0b486ae418db4f3 Mon Sep 17 00:00:00 2001
From: Christoph Hellwig <hch@lst.de>
Date: Tue, 31 Jul 2007 00:39:22 -0700
Subject: [PATCH] --- yaml --- r: 63369 b: refs/heads/master c:
 0af1a4504699524c876361845bc2e301ecc45d0f h: refs/heads/master i:   63367:
 492f465597559f78b41d890ef5e063ed35541d4c v: v3

---
 [refs]                   | 2 +-
 trunk/fs/gfs2/ops_file.c | 2 +-
 trunk/fs/locks.c         | 8 ++++----
 trunk/include/linux/fs.h | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 1d562eae917e..e9e1cf4bf496 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 86d0004abc87025bae1cca43c94e99a27b7bbbd6
+refs/heads/master: 0af1a4504699524c876361845bc2e301ecc45d0f
diff --git a/trunk/fs/gfs2/ops_file.c b/trunk/fs/gfs2/ops_file.c
index 1a5e8e893d75..773421130116 100644
--- a/trunk/fs/gfs2/ops_file.c
+++ b/trunk/fs/gfs2/ops_file.c
@@ -508,7 +508,7 @@ static int gfs2_setlease(struct file *file, long arg, struct file_lock **fl)
 	 */
 	if (!sdp->sd_args.ar_localflocks)
 		return -EINVAL;
-	return setlease(file, arg, fl);
+	return generic_setlease(file, arg, fl);
 }
 
 /**
diff --git a/trunk/fs/locks.c b/trunk/fs/locks.c
index 310510637247..50857d2d3404 100644
--- a/trunk/fs/locks.c
+++ b/trunk/fs/locks.c
@@ -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, struct file_lock **flp)
 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 arg, struct file_lock **lease)
 	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;
diff --git a/trunk/include/linux/fs.h b/trunk/include/linux/fs.h
index d33beadd9a43..6bf139562947 100644
--- a/trunk/include/linux/fs.h
+++ b/trunk/include/linux/fs.h
@@ -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 __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);