summaryrefslogtreecommitdiffstats
path: root/fs/inode.c
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2008-05-10 00:24:09 +0200
committerRussell King <rmk+kernel@arm.linux.org.uk>2008-05-10 00:24:09 +0200
commit1f2ee6496b1f71e9d5aa2448745e65fbafdc3bd5 (patch)
tree3f143311afca5e316afd06c2fc4f7d73b19cdcf0 /fs/inode.c
parent[ARM] 5033/1: Unbreak corgi_ssp by registering ssp drivers earlier. (diff)
parent[ARM] Orion: clean up addr-map.c after window setting code purge (diff)
downloadlinux-1f2ee6496b1f71e9d5aa2448745e65fbafdc3bd5.tar.xz
linux-1f2ee6496b1f71e9d5aa2448745e65fbafdc3bd5.zip
Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/nico/orion into fixes
Diffstat (limited to 'fs/inode.c')
-rw-r--r--fs/inode.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/fs/inode.c b/fs/inode.c
index bf6478130424..c36d9480335c 100644
--- a/fs/inode.c
+++ b/fs/inode.c
@@ -1149,13 +1149,8 @@ static inline void iput_final(struct inode *inode)
void iput(struct inode *inode)
{
if (inode) {
- const struct super_operations *op = inode->i_sb->s_op;
-
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);
}