From: Liu Bo <bo.li.liu@oracle.com>
Date: Sun, 26 May 2013 13:50:29 +0000 (+0000)
Subject: Btrfs: kill replicate code in replay_one_buffer
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=2da1c669f0f236f844bb884a7d373296184636af;p=openwrt%2Fstaging%2Fblogic.git

Btrfs: kill replicate code in replay_one_buffer

EXTREF is treated same as REF, so we can make the code tidy.

Signed-off-by: Liu Bo <bo.li.liu@oracle.com>
Signed-off-by: Josef Bacik <jbacik@fusionio.com>
---

diff --git a/fs/btrfs/tree-log.c b/fs/btrfs/tree-log.c
index a59724e6c9f5..965d5e64b480 100644
--- a/fs/btrfs/tree-log.c
+++ b/fs/btrfs/tree-log.c
@@ -2016,13 +2016,8 @@ static int replay_one_buffer(struct btrfs_root *log, struct extent_buffer *eb,
 					     eb, i, &key);
 			if (ret)
 				break;
-		} else if (key.type == BTRFS_INODE_REF_KEY) {
-			ret = add_inode_ref(wc->trans, root, log, path,
-					    eb, i, &key);
-			if (ret && ret != -ENOENT)
-				break;
-			ret = 0;
-		} else if (key.type == BTRFS_INODE_EXTREF_KEY) {
+		} else if (key.type == BTRFS_INODE_REF_KEY ||
+			   key.type == BTRFS_INODE_EXTREF_KEY) {
 			ret = add_inode_ref(wc->trans, root, log, path,
 					    eb, i, &key);
 			if (ret && ret != -ENOENT)