summaryrefslogtreecommitdiff
path: root/fs/inode.c
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2010-06-04 20:19:55 -0400
committerAl Viro <viro@zeniv.linux.org.uk>2010-08-09 16:47:48 -0400
commit661074e91b1da1ee262dfde6dd836deacccb9def (patch)
tree97227898352c3bea7975fcc0bb98a8e013b1d03b /fs/inode.c
parentc6287315cb958e740466555ca5e9d007f25b39bd (diff)
Take ->i_bdev/->i_cdev handling out of clear_inode()
All call chains to clear_inode() pass through evict_inode() and clear_inode() should be called by evict_inode() exactly once. So we can pull i_bdev/i_cdev detaching up to evict_inode() itself. Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/inode.c')
-rw-r--r--fs/inode.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/inode.c b/fs/inode.c
index 256e620c6416..9aff7deaf816 100644
--- a/fs/inode.c
+++ b/fs/inode.c
@@ -313,10 +313,6 @@ void clear_inode(struct inode *inode)
inode_sync_wait(inode);
if (inode->i_sb->s_op->clear_inode)
inode->i_sb->s_op->clear_inode(inode);
- if (S_ISBLK(inode->i_mode) && inode->i_bdev)
- bd_forget(inode);
- if (S_ISCHR(inode->i_mode) && inode->i_cdev)
- cd_forget(inode);
inode->i_state = I_FREEING | I_CLEAR;
}
EXPORT_SYMBOL(clear_inode);
@@ -334,6 +330,10 @@ static void evict(struct inode *inode, int delete)
truncate_inode_pages(&inode->i_data, 0);
clear_inode(inode);
}
+ if (S_ISBLK(inode->i_mode) && inode->i_bdev)
+ bd_forget(inode);
+ if (S_ISCHR(inode->i_mode) && inode->i_cdev)
+ cd_forget(inode);
}
/*