diff options
| author | Patrick Mochel <mochel@osdl.org> | 2002-11-20 00:05:53 -0600 |
|---|---|---|
| committer | Patrick Mochel <mochel@osdl.org> | 2002-11-20 00:05:53 -0600 |
| commit | 3c31f49e8830d17e3cff6a727b0e4c8821078766 (patch) | |
| tree | b1979ecc9deec76e19d8c05e7296f6165f5a0d71 /include/linux | |
| parent | b12cf4fff95fc6bab2b350160cba008c1467d19e (diff) | |
| parent | 9de88958343f0628e08d6117c9dae8d31b858cbb (diff) | |
Merge osdl.org:/home/mochel/src/kernel/devel/linux-2.5-virgin
into osdl.org:/home/mochel/src/kernel/devel/linux-2.5-kobject
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/fs.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/linux/fs.h b/include/linux/fs.h index 400a5674083b..7aa6498d7d5d 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -578,7 +578,7 @@ extern int posix_lock_file(struct file *, struct file_lock *); extern void posix_block_lock(struct file_lock *, struct file_lock *); extern void posix_unblock_lock(struct file *, struct file_lock *); extern int posix_locks_deadlock(struct file_lock *, struct file_lock *); -extern int __get_lease(struct inode *inode, unsigned int flags); +extern int __break_lease(struct inode *inode, unsigned int flags); extern void lease_get_mtime(struct inode *, struct timespec *time); extern int lock_may_read(struct inode *, loff_t start, unsigned long count); extern int lock_may_write(struct inode *, loff_t start, unsigned long count); @@ -1052,10 +1052,10 @@ static inline int locks_verify_truncate(struct inode *inode, return 0; } -static inline int get_lease(struct inode *inode, unsigned int mode) +static inline int break_lease(struct inode *inode, unsigned int mode) { - if (inode->i_flock && (inode->i_flock->fl_flags & FL_LEASE)) - return __get_lease(inode, mode); + if (inode->i_flock) + return __break_lease(inode, mode); return 0; } |