diff --git a/[refs] b/[refs] index aea505f75b76..b8f5567e8c78 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0e4de58432f552c0ecead965b0fad8a9fb1d31ec +refs/heads/master: eef1c494a2d4212e13c67d05e9cc3cd1e6dfed5d diff --git a/trunk/fs/btrfs/ctree.c b/trunk/fs/btrfs/ctree.c index 1b47fe71e0b4..3b16051b121b 100644 --- a/trunk/fs/btrfs/ctree.c +++ b/trunk/fs/btrfs/ctree.c @@ -1717,11 +1717,10 @@ static int push_leaf_left(struct btrfs_trans_handle *trans, struct btrfs_root btrfs_item_nr_offset(push_items), (btrfs_header_nritems(right) - push_items) * sizeof(struct btrfs_item)); - } - btrfs_set_header_nritems(right, right_nritems - push_items); + right_nritems -= push_items; + btrfs_set_header_nritems(right, right_nritems); push_space = BTRFS_LEAF_DATA_SIZE(root); - for (i = 0; i < right_nritems; i++) { item = btrfs_item_nr(right, i);