From 288790be0ab7e4f4dcf603b902bc260250217c95 Mon Sep 17 00:00:00 2001
From: Jan Schmidt <list.btrfs@jan-o-sch.net>
Date: Fri, 22 Jun 2012 14:52:13 +0200
Subject: [PATCH] --- yaml --- r: 311655 b: refs/heads/master c:
 19956c7e94a7a58d6df8c4db5ae62f9109a7c663 h: refs/heads/master i:   311653:
 47d918c745342ea0effc58da5f8774366461834b   311651:
 e6e072805164fcba2a9c690ddef79e7224e0b6dd   311647:
 5fd51f3816b6616e3a3aff8a9824f04482536ae5 v: v3

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

diff --git a/[refs] b/[refs]
index ef58557c3b6d..60c1e958aedb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 155725c9c051a343be5e555bf943da827e6cf721
+refs/heads/master: 19956c7e94a7a58d6df8c4db5ae62f9109a7c663
diff --git a/trunk/fs/btrfs/ctree.c b/trunk/fs/btrfs/ctree.c
index e005d9b04616..b98f8604f4f6 100644
--- a/trunk/fs/btrfs/ctree.c
+++ b/trunk/fs/btrfs/ctree.c
@@ -1094,11 +1094,7 @@ __tree_mod_log_rewind(struct extent_buffer *eb, u64 time_seq,
 						      tm->generation);
 			break;
 		case MOD_LOG_KEY_ADD:
-			if (tm->slot != n - 1) {
-				o_dst = btrfs_node_key_ptr_offset(tm->slot);
-				o_src = btrfs_node_key_ptr_offset(tm->slot + 1);
-				memmove_extent_buffer(eb, o_dst, o_src, p_size);
-			}
+			/* if a move operation is needed it's in the log */
 			n--;
 			break;
 		case MOD_LOG_MOVE_KEYS: