diff --git a/[refs] b/[refs] index bb1467bdb23c..0101d3706617 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f9ffed26d6f3e6ac9988947242821579d615fda7 +refs/heads/master: 4698afe8e3a725576366f86560a8a8242b21b9f7 diff --git a/trunk/fs/locks.c b/trunk/fs/locks.c index 94f5d8065e3a..4c73b857dded 100644 --- a/trunk/fs/locks.c +++ b/trunk/fs/locks.c @@ -1336,7 +1336,7 @@ int fcntl_getlease(struct file *filp) * * Called with kernel lock held. */ -static int setlease(struct file *filp, long arg, struct file_lock **flp) +int 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; @@ -1421,6 +1421,7 @@ static int setlease(struct file *filp, long arg, struct file_lock **flp) out: return error; } +EXPORT_SYMBOL(setlease); /** * vfs_setlease - sets a lease on an open file diff --git a/trunk/include/linux/fs.h b/trunk/include/linux/fs.h index c8ddf34e9710..b188c2e5338d 100644 --- a/trunk/include/linux/fs.h +++ b/trunk/include/linux/fs.h @@ -872,6 +872,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 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);