Commit eaee50e8 authored by Chris Mason's avatar Chris Mason Committed by David Woodhouse
Browse files

Btrfs: merge leaves before split

parent 9aca1d51
Loading
Loading
Loading
Loading
+0 −2
Original line number Diff line number Diff line
* 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)
+9 −0
Original line number Diff line number Diff line
@@ -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;