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 /include | |
parent | 31d9168d27fac127d449cb9fa252d880de872c7f (diff) | |
parent | 0b2bac2f1ea0d33a3621b27ca68b9ae760fca2e9 (diff) | |
download | blackbird-op-linux-bb78be8397d3b0900af3d717672218ee3ea07985.tar.gz blackbird-op-linux-bb78be8397d3b0900af3d717672218ee3ea07985.zip |
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 'include')
-rw-r--r-- | include/linux/fs.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/include/linux/fs.h b/include/linux/fs.h index a1ba005d08e7..7e0fa9e64479 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -1289,17 +1289,12 @@ extern ssize_t vfs_readv(struct file *, const struct iovec __user *, extern ssize_t vfs_writev(struct file *, const struct iovec __user *, unsigned long, loff_t *); -/* - * NOTE: write_inode, delete_inode, clear_inode, put_inode can be called - * without the big kernel lock held in all filesystems. - */ struct super_operations { struct inode *(*alloc_inode)(struct super_block *sb); 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 *); |