---

yaml --- r: 311655 b: refs/heads/master c: 19956c7 h: refs/heads/master i: 311653: 47d918c 311651: e6e0728 311647: 5fd51f3 v: v3
git-mirror · Jun 27, 2012 · 288790b · 288790b
1 parent 78f8357
commit 288790b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git 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
@@ -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: