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 256e620c6416a7f6502a3a159e2d3d286afc91dd..9aff7deaf8168644856a271889550f07e21941ed 100644 (file)
--- 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);
 }
 
 /*