Merge branch 'akpm' (incoming from Andrew)

[linux.git] / fs / block_dev.c

diff --git a/fs/block_dev.c b/fs/block_dev.c
index aae187a7f94a661edb82189496242fdac4c33fcf..ce08de7467a337231da89a19958a27ff6a2e8b4c 100644 (file)
--- a/fs/block_dev.c
+++ b/fs/block_dev.c
@@ -617,11 +617,9 @@ void bd_forget(struct inode *inode)
        struct block_device *bdev = NULL;
 
        spin_lock(&bdev_lock);
-       if (inode->i_bdev) {
-               if (!sb_is_blkdev_sb(inode->i_sb))
-                       bdev = inode->i_bdev;
-               __bd_forget(inode);
-       }
+       if (!sb_is_blkdev_sb(inode->i_sb))
+               bdev = inode->i_bdev;
+       __bd_forget(inode);
        spin_unlock(&bdev_lock);
 
        if (bdev)