From: Yan Hong <clouds.yan@gmail.com>
Date: Thu, 25 Oct 2012 01:14:45 +0000 (+1100)
Subject: fs/block_dev.c: no need to check inode->i_bdev in bd_forget()
X-Git-Tag: next-20121029~1^2~123
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=54e7958eb2e2091e35e8fed32404d2ed77a10daa;p=karo-tx-linux.git

fs/block_dev.c: no need to check inode->i_bdev in bd_forget()

Its only caller evict() has promised a non-NULL inode->i_bdev.

Signed-off-by: Yan Hong <clouds.yan@gmail.com>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

diff --git a/fs/block_dev.c b/fs/block_dev.c
index 842fcbb78417..eb0553c7751a 100644
--- a/fs/block_dev.c
+++ b/fs/block_dev.c
@@ -695,11 +695,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)