From b4974ae4a32324734978374b83fd8488bcea5614 Mon Sep 17 00:00:00 2001
From: Liu Bo <bo.li.liu@oracle.com>
Date: Fri, 19 Oct 2012 09:50:53 +0000
Subject: [PATCH] --- yaml --- r: 346647 b: refs/heads/master c:
 6a7a665d78c5dd8bc76a010648c4e7d84517ab5a h: refs/heads/master i:   346645:
 f62cc9663b8665cff547d594e53d332be7f210a4   346643:
 ba6f83f2801864d2bf4d86e3785cbc0603ccadd2   346639:
 a206378d4a67219444b7de03b01f0ba2bfbdf297 v: v3

---
 [refs]                 |  2 +-
 trunk/fs/btrfs/ctree.c | 10 ++++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 0448ba046b37..a061e83f6d5f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 95c80bb1f6b24b57058d971ed252b2c1c5121b51
+refs/heads/master: 6a7a665d78c5dd8bc76a010648c4e7d84517ab5a
diff --git a/trunk/fs/btrfs/ctree.c b/trunk/fs/btrfs/ctree.c
index b12c03959162..4d518bd7751d 100644
--- a/trunk/fs/btrfs/ctree.c
+++ b/trunk/fs/btrfs/ctree.c
@@ -4609,6 +4609,12 @@ static void del_ptr(struct btrfs_trans_handle *trans, struct btrfs_root *root,
 	u32 nritems;
 	int ret;
 
+	if (tree_mod_log && level) {
+		ret = tree_mod_log_insert_key(root->fs_info, parent, slot,
+					      MOD_LOG_KEY_REMOVE);
+		BUG_ON(ret < 0);
+	}
+
 	nritems = btrfs_header_nritems(parent);
 	if (slot != nritems - 1) {
 		if (tree_mod_log && level)
@@ -4619,10 +4625,6 @@ static void del_ptr(struct btrfs_trans_handle *trans, struct btrfs_root *root,
 			      btrfs_node_key_ptr_offset(slot + 1),
 			      sizeof(struct btrfs_key_ptr) *
 			      (nritems - slot - 1));
-	} else if (tree_mod_log && level) {
-		ret = tree_mod_log_insert_key(root->fs_info, parent, slot,
-					      MOD_LOG_KEY_REMOVE);
-		BUG_ON(ret < 0);
 	}
 
 	nritems--;