diff options
| author | Yan Zheng <zheng.yan@oracle.com> | 2008-12-17 10:21:48 -0500 |
|---|---|---|
| committer | Chris Mason <chris.mason@oracle.com> | 2008-12-17 10:21:48 -0500 |
| commit | 87b29b208c6c38f3446d2de6ece946e2459052cf (patch) | |
| tree | 43e717289e1e8446fced4093ab39667bba9ea60a /fs/btrfs/tree-log.c | |
| parent | d7f735d0bc68c411abda0a612e1421bdade649cc (diff) | |
| download | kernel_goldelico_gta04-87b29b208c6c38f3446d2de6ece946e2459052cf.zip kernel_goldelico_gta04-87b29b208c6c38f3446d2de6ece946e2459052cf.tar.gz kernel_goldelico_gta04-87b29b208c6c38f3446d2de6ece946e2459052cf.tar.bz2 | |
Btrfs: properly check free space for tree balancing
btrfs_insert_empty_items takes the space needed by the btrfs_item
structure into account when calculating the required free space.
So the tree balancing code shouldn't add sizeof(struct btrfs_item)
to the size when checking the free space. This patch removes these
superfluous additions.
Signed-off-by: Yan Zheng <zheng.yan@oracle.com>
Diffstat (limited to 'fs/btrfs/tree-log.c')
| -rw-r--r-- | fs/btrfs/tree-log.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/fs/btrfs/tree-log.c b/fs/btrfs/tree-log.c index 6ac1b7f..33eee25 100644 --- a/fs/btrfs/tree-log.c +++ b/fs/btrfs/tree-log.c @@ -374,13 +374,8 @@ insert: if (found_size > item_size) { btrfs_truncate_item(trans, root, path, item_size, 1); } else if (found_size < item_size) { - ret = btrfs_del_item(trans, root, - path); - BUG_ON(ret); - - btrfs_release_path(root, path); - ret = btrfs_insert_empty_item(trans, - root, path, key, item_size); + ret = btrfs_extend_item(trans, root, path, + item_size - found_size); BUG_ON(ret); } } else if (ret) { |