From: Yan Hong <clouds.yan@gmail.com>
Date: Fri, 28 Sep 2012 00:19:02 +0000 (+1000)
Subject: fs/block_dev.c: no need to check inode->i_bdev in bd_forget()
X-Git-Tag: next-20121004~1^2~372
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=f418224493ee06bbd440e5c962c97bc45654aa7a;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 37967bcea05c..246a81ea2f11 100644
--- a/fs/block_dev.c
+++ b/fs/block_dev.c
@@ -696,11 +696,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)