diff options
| author | Chris Mason <chris.mason@oracle.com> | 2007-03-13 11:17:52 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@hera.kernel.org> | 2007-03-13 11:17:52 -0400 |
| commit | eaee50e881b88766d9a781c54c4142456cf5e527 (patch) | |
| tree | 77d26155f563d20d431592236493bde4ae9d9b08 | |
| parent | 9aca1d51323c0291a7358e0728b64ec4f17d1a77 (diff) | |
Btrfs: merge leaves before split
Signed-off-by: Chris Mason <chris.mason@oracle.com>
| -rw-r--r-- | fs/btrfs/TODO | 2 | ||||
| -rw-r--r-- | fs/btrfs/ctree.c | 9 |
2 files changed, 9 insertions, 2 deletions
diff --git a/fs/btrfs/TODO b/fs/btrfs/TODO index 52d2a7a071f4..ad29267b8738 100644 --- a/fs/btrfs/TODO +++ b/fs/btrfs/TODO @@ -1,10 +1,8 @@ * cleanup, add more error checking, get rid of BUG_ONs -* endian fixes * Make IO functions look more like the page cache * Fix ENOSPC handling * make blocksize a mkfs parameter instead of #define * make a real mkfs and superblock -* Add shadowing and transactions * Do checksumming * Define FS objects in terms of different item types * Add block mapping tree (simple dm layer) diff --git a/fs/btrfs/ctree.c b/fs/btrfs/ctree.c index bbb632291709..dc620186e501 100644 --- a/fs/btrfs/ctree.c +++ b/fs/btrfs/ctree.c @@ -1043,6 +1043,15 @@ static int split_leaf(struct btrfs_root *root, struct btrfs_path *path, int ret; int wret; + wret = push_leaf_left(root, path, data_size); + if (wret < 0) + return wret; + if (wret) { + wret = push_leaf_right(root, path, data_size); + if (wret < 0) + return wret; + } + l_buf = path->nodes[0]; l = &l_buf->leaf; |