From f6ec5fc22edfc1f3590790211ae953a699ab7450 Mon Sep 17 00:00:00 2001
From: Tsutomu Itoh <t-itoh@jp.fujitsu.com>
Date: Thu, 6 Sep 2012 03:08:59 -0600
Subject: [PATCH] --- yaml --- r: 332547 b: refs/heads/master c:
 f54fb859da53f04a443c5e3f4cb9b936ed42d227 h: refs/heads/master i:   332545:
 5bb04d1b036c3fd441451b72ba11686989130112   332543:
 b713f647912c12be11d881f46b2ea47b149cd17a v: v3

---
 [refs]                      | 2 +-
 trunk/fs/btrfs/relocation.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 4406ad7cb176..4a3eb8186e28 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 903889f462409c816893abd02d88636f7b4a7774
+refs/heads/master: f54fb859da53f04a443c5e3f4cb9b936ed42d227
diff --git a/trunk/fs/btrfs/relocation.c b/trunk/fs/btrfs/relocation.c
index 5a15c96a18ff..7e7fd1bcfc54 100644
--- a/trunk/fs/btrfs/relocation.c
+++ b/trunk/fs/btrfs/relocation.c
@@ -3270,8 +3270,8 @@ static int delete_block_group_cache(struct btrfs_fs_info *fs_info,
 	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;
 	}