summaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorJan Schmidt <list.btrfs@jan-o-sch.net>2012-05-31 19:24:36 +0200
committerJan Schmidt <list.btrfs@jan-o-sch.net>2012-05-31 19:56:19 +0200
commitc31931088fd6cf953bd0868a2647b6c3928e6c96 (patch)
tree657827f1fd4be55e2f1d52a661c8803b80c08de7 /fs
parentf395694c2cd76cb1882fa82dd37e761598367fe9 (diff)
downloadlinux-3.10-c31931088fd6cf953bd0868a2647b6c3928e6c96.tar.gz
linux-3.10-c31931088fd6cf953bd0868a2647b6c3928e6c96.tar.bz2
linux-3.10-c31931088fd6cf953bd0868a2647b6c3928e6c96.zip
Btrfs: fix tree mod log rewinded level and rewinding of moved keys
When we rewind REMOVE_WHILE_FREEING operations, there's code that allocates a fresh buffer instead of cloning the old one. Setting that buffer's level correctly was missing in this case. When rewinding a MOVE_KEYS operation, btrfs_node_key_ptr_offset(slot) was missing for memmove_extent_buffer()'s arguments. Signed-off-by: Jan Schmidt <list.btrfs@jan-o-sch.net>
Diffstat (limited to 'fs')
-rw-r--r--fs/btrfs/ctree.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/fs/btrfs/ctree.c b/fs/btrfs/ctree.c
index 63147c1315a..b4534d918e4 100644
--- a/fs/btrfs/ctree.c
+++ b/fs/btrfs/ctree.c
@@ -1076,7 +1076,9 @@ __tree_mod_log_rewind(struct extent_buffer *eb, u64 time_seq,
n--;
break;
case MOD_LOG_MOVE_KEYS:
- memmove_extent_buffer(eb, tm->slot, tm->move.dst_slot,
+ o_dst = btrfs_node_key_ptr_offset(tm->slot);
+ o_src = btrfs_node_key_ptr_offset(tm->move.dst_slot);
+ memmove_extent_buffer(eb, o_dst, o_src,
tm->move.nr_items * p_size);
break;
case MOD_LOG_ROOT_REPLACE:
@@ -1127,6 +1129,7 @@ tree_mod_log_rewind(struct btrfs_fs_info *fs_info, struct extent_buffer *eb,
btrfs_set_header_backref_rev(eb_rewin,
btrfs_header_backref_rev(eb));
btrfs_set_header_owner(eb_rewin, btrfs_header_owner(eb));
+ btrfs_set_header_level(eb_rewin, btrfs_header_level(eb));
} else {
eb_rewin = btrfs_clone_extent_buffer(eb);
BUG_ON(!eb_rewin);
@@ -2609,7 +2612,6 @@ int btrfs_search_old_slot(struct btrfs_root *root, struct btrfs_key *key,
}
again:
- level = 0;
b = get_old_root(root, time_seq);
extent_buffer_get(b);
level = btrfs_header_level(b);