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 /fs/inode.c | |
| parent | Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev (diff) | |
| parent | [PATCH] fix SMP ordering hole in fcntl_setlk() (diff) | |
| download | linux-dev-bb78be8397d3b0900af3d717672218ee3ea07985.tar.xz linux-dev-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 'fs/inode.c')
| -rw-r--r-- | fs/inode.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/fs/inode.c b/fs/inode.c index bf6478130424..18bdce14b70c 100644 --- a/fs/inode.c +++ b/fs/inode.c @@ -1153,9 +1153,6 @@ void iput(struct inode *inode) BUG_ON(inode->i_state == I_CLEAR); - if (op && op->put_inode) - op->put_inode(inode); - if (atomic_dec_and_lock(&inode->i_count, &inode_lock)) iput_final(inode); } |