commit f54fb859da53f04a443c5e3f4cb9b936ed42d227
author Tsutomu Itoh <t-itoh@jp.fujitsu.com> Thu Sep 06 03:08:59 2012 -0600
committer Chris Mason <chris.mason@fusionio.com> Mon Oct 01 15:19:14 2012 -0400
tree 21fba36b78cf33ada070fdfea0529cac8b4b6194
parent 903889f462409c816893abd02d88636f7b4a7774

Btrfs: fix error handling in delete_block_group_cache()

btrfs_iget() never return NULL.
So, NULL check is unnecessary.

Signed-off-by: Tsutomu Itoh <t-itoh@jp.fujitsu.com>

fs/btrfs/relocation.c

diff --git a/fs/btrfs/relocation.c b/fs/btrfs/relocation.c
index 5a15c96..7e7fd1b 100644
--- a/fs/btrfs/relocation.c
+++ b/fs/btrfs/relocation.c
@@ -3270,8 +3270,8 @@
 	key.offset = 0;
 
 	inode = btrfs_iget(fs_info->sb, &key, root, NULL);
-	if (IS_ERR_OR_NULL(inode) || is_bad_inode(inode)) {
-		if (inode && !IS_ERR(inode))
+	if (IS_ERR(inode) || is_bad_inode(inode)) {
+		if (!IS_ERR(inode))
 			iput(inode);
 		return -ENOENT;
 	}