diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-25 11:45:40 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-25 11:45:40 -0700 |
| commit | cf2ec150fc5f59dbf2260863225c79aa0cfc46af (patch) | |
| tree | bd55070b0bc2f8597c35b575374bd0cd2f2d14d6 /include/linux/fs.h | |
| parent | 9f4def9ae4772ea3da5e2359de698742ebae53b5 (diff) | |
| parent | e36cd4a2873c398ba188f16e4087cce7f00a1506 (diff) | |
| download | kernel-crypto-cf2ec150fc5f59dbf2260863225c79aa0cfc46af.tar.gz kernel-crypto-cf2ec150fc5f59dbf2260863225c79aa0cfc46af.tar.xz kernel-crypto-cf2ec150fc5f59dbf2260863225c79aa0cfc46af.zip | |
Merge branch 'for-linus' of git://linux-nfs.org/~bfields/linux
* 'for-linus' of git://linux-nfs.org/~bfields/linux:
nfsd: don't allow setting ctime over v4
Update to NFS/RDMA documentation
locks: don't call ->copy_lock methods on return of conflicting locks
lockd: unlock lockd locks held for a certain filesystem
lockd: unlock lockd locks associated with a given server ip
leases: remove unneeded variable from fcntl_setlease().
leases: move lock allocation earlier in generic_setlease()
leases: when unlocking, skip locking-related steps
leases: fix a return-value mixup
Diffstat (limited to 'include/linux/fs.h')
| -rw-r--r-- | include/linux/fs.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/fs.h b/include/linux/fs.h index cc2be2cf7d4..6556f2f967e 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -973,6 +973,7 @@ extern int do_sync_mapping_range(struct address_space *mapping, loff_t offset, /* fs/locks.c */ extern void locks_init_lock(struct file_lock *); extern void locks_copy_lock(struct file_lock *, struct file_lock *); +extern void __locks_copy_lock(struct file_lock *, const struct file_lock *); extern void locks_remove_posix(struct file *, fl_owner_t); extern void locks_remove_flock(struct file *); extern void posix_test_lock(struct file *, struct file_lock *); |