Btrfs: merge leaves before split
Signed-off-by: Chris Mason <chris.mason@oracle.com>
diff --git a/fs/btrfs/TODO b/fs/btrfs/TODO
index 52d2a7a..ad29267 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 bbb6322..dc62018 100644
--- a/fs/btrfs/ctree.c
+++ b/fs/btrfs/ctree.c
@@ -1043,6 +1043,15 @@
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;