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>
diff --git a/fs/inode.c b/fs/inode.c
index 256e620..9aff7de 100644
--- a/fs/inode.c
+++ b/fs/inode.c
@@ -313,10 +313,6 @@
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 @@
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);
}
/*