diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-06 11:39:57 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-06 11:39:57 -0700 |
| commit | bb78be8397d3b0900af3d717672218ee3ea07985 (patch) | |
| tree | 8d16cb48aa31d29a0e3f5aa94d4b5ea965b553ba /Documentation/filesystems/Locking | |
| parent | 31d9168d27fac127d449cb9fa252d880de872c7f (diff) | |
| parent | 0b2bac2f1ea0d33a3621b27ca68b9ae760fca2e9 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6:
[PATCH] fix SMP ordering hole in fcntl_setlk()
[PATCH] kill ->put_inode
[PATCH] fix reservation discarding in affs
Diffstat (limited to 'Documentation/filesystems/Locking')
| -rw-r--r-- | Documentation/filesystems/Locking | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/Documentation/filesystems/Locking b/Documentation/filesystems/Locking index c2992bc54f2f..8b22d7d8b991 100644 --- a/Documentation/filesystems/Locking +++ b/Documentation/filesystems/Locking @@ -92,7 +92,6 @@ prototypes: void (*destroy_inode)(struct inode *); void (*dirty_inode) (struct inode *); int (*write_inode) (struct inode *, int); - void (*put_inode) (struct inode *); void (*drop_inode) (struct inode *); void (*delete_inode) (struct inode *); void (*put_super) (struct super_block *); @@ -115,7 +114,6 @@ alloc_inode: no no no destroy_inode: no dirty_inode: no (must not sleep) write_inode: no -put_inode: no drop_inode: no !!!inode_lock!!! delete_inode: no put_super: yes yes no |