Btrfs: ctree.c cleanups
Fixup a few buffer_head release errors, and fix an off by one in
balance_node_right.
Signed-off-by: Chris Mason <chris.mason@oracle.com>
diff --git a/fs/btrfs/ctree.c b/fs/btrfs/ctree.c
index c0782a5..89e282c 100644
--- a/fs/btrfs/ctree.c
+++ b/fs/btrfs/ctree.c
@@ -266,8 +266,10 @@
err = __btrfs_cow_block(trans, root, cur_bh, parent, i,
&tmp_bh, search_start,
min(8, end_slot - i));
- if (err)
+ if (err) {
+ brelse(cur_bh);
break;
+ }
search_start = bh_blocknr(tmp_bh);
*last_ret = search_start;
if (parent_level == 1)
@@ -881,7 +883,6 @@
ins_len, int cow)
{
struct buffer_head *b;
- struct buffer_head *cow_buf;
struct btrfs_node *c;
u64 blocknr;
int slot;
@@ -905,12 +906,11 @@
wret = btrfs_cow_block(trans, root, b,
p->nodes[level + 1],
p->slots[level + 1],
- &cow_buf);
+ &b);
if (wret) {
- btrfs_block_release(root, cow_buf);
+ btrfs_block_release(root, b);
return wret;
}
- b = cow_buf;
c = btrfs_buffer_node(b);
}
BUG_ON(!cow && ins_len);
@@ -1075,8 +1075,9 @@
max_push = src_nritems / 2 + 1;
/* don't try to empty the node */
- if (max_push > src_nritems)
+ if (max_push >= src_nritems)
return 1;
+
if (max_push < push_items)
push_items = max_push;
@@ -1465,6 +1466,7 @@
ret = btrfs_cow_block(trans, root, t, path->nodes[1], slot - 1, &t);
if (ret) {
/* we hit -ENOSPC, but it isn't fatal here */
+ btrfs_block_release(root, t);
return 1;
}
left = btrfs_buffer_leaf(t);