Merge branch 'sh/clkfwk' into sh-latest

[~andy/linux] / fs / block_dev.c

diff --git a/fs/block_dev.c b/fs/block_dev.c
index ba11c30f302dd37012d361a14c96db7c8ca22d0f..c2bbe1fb132632c14ebb2ea0675ad78500441a52 100644 (file)
--- a/fs/block_dev.c
+++ b/fs/block_dev.c
@@ -487,7 +487,7 @@ static void bdev_evict_inode(struct inode *inode)
        struct list_head *p;
        truncate_inode_pages(&inode->i_data, 0);
        invalidate_inode_buffers(inode); /* is it needed here? */
-       end_writeback(inode);
+       clear_inode(inode);
        spin_lock(&bdev_lock);
        while ( (p = bdev->bd_inodes.next) != &bdev->bd_inodes ) {
                __bd_forget(list_entry(p, struct inode, i_devices));