diff options
| author | Chris Mason <chris.mason@oracle.com> | 2009-02-04 09:12:46 -0500 |
|---|---|---|
| committer | Chris Mason <chris.mason@oracle.com> | 2009-02-04 09:12:46 -0500 |
| commit | 7b78c170dc4f538cc7ee66f47b3aac3f3974a36c (patch) | |
| tree | e2301fba4de0f3a04cf4b691f63e2bdf1e8c64d2 /fs/btrfs | |
| parent | 12f4daccfc3732280debba8f9ba49720372de831 (diff) | |
| download | linux-stable-7b78c170dc4f538cc7ee66f47b3aac3f3974a36c.tar.gz linux-stable-7b78c170dc4f538cc7ee66f47b3aac3f3974a36c.tar.bz2 linux-stable-7b78c170dc4f538cc7ee66f47b3aac3f3974a36c.zip | |
Btrfs: Only prep for btree deletion balances when nodes are mostly empty
Whenever an item deletion is done, we need to balance all the nodes
in the tree to make sure we don't end up with an empty node if a pointer
is deleted. This balance prep happens from the root of the tree down
so we can drop our locks as we go.
reada_for_balance was triggering read-ahead on neighboring nodes even
when no balancing was required. This adds an extra check to avoid
calling balance_level() and avoid reada_for_balance() when a balance
won't be required.
Signed-off-by: Chris Mason <chris.mason@oracle.com>
Diffstat (limited to 'fs/btrfs')
| -rw-r--r-- | fs/btrfs/ctree.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/fs/btrfs/ctree.c b/fs/btrfs/ctree.c index 0d1e3b91e7bd..551177c0011a 100644 --- a/fs/btrfs/ctree.c +++ b/fs/btrfs/ctree.c @@ -1518,18 +1518,19 @@ again: */ if (prealloc_block.objectid && prealloc_block.offset != b->len) { - btrfs_set_path_blocking(p); + btrfs_release_path(root, p); btrfs_free_reserved_extent(root, prealloc_block.objectid, prealloc_block.offset); prealloc_block.objectid = 0; + goto again; } /* * for higher level blocks, try not to allocate blocks * with the block and the parent locks held. */ - if (level > 1 && !prealloc_block.objectid && + if (level > 0 && !prealloc_block.objectid && btrfs_path_lock_waiting(p, level)) { u32 size = b->len; u64 hint = b->start; @@ -1614,7 +1615,9 @@ cow_done: } b = p->nodes[level]; slot = p->slots[level]; - } else if (ins_len < 0) { + } else if (ins_len < 0 && + btrfs_header_nritems(b) < + BTRFS_NODEPTRS_PER_BLOCK(root) / 4) { int sret; sret = reada_for_balance(root, p, level); |