---

yaml --- r: 128497 b: refs/heads/master c: 7936ca3 h: refs/heads/master i: 128495: 93c8db5 v: v3
git-mirror · Sep 25, 2008 · 18e8f72 · 18e8f72
1 parent c7e4c00
commit 18e8f72
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a6b6e75e096f436f0cc56edf5bca96301e194491
+refs/heads/master: 7936ca3883e5fef8ce5cc367a4356ad5fed67180
diff --git a/trunk/fs/btrfs/ctree.c b/trunk/fs/btrfs/ctree.c
@@ -2380,7 +2380,7 @@ int btrfs_del_item(struct btrfs_trans_handle *trans, struct btrfs_root *root,
 		}
 
 		/* delete the leaf if it is mostly empty */
-		if (0 && used < BTRFS_LEAF_DATA_SIZE(root) / 3) {
+		if (used < BTRFS_LEAF_DATA_SIZE(root) / 3) {
 			/* push_leaf_left fixes the path.
 			 * make sure the path still points to our leaf
 			 * for possible call to del_ptr below

diff --git a/trunk/fs/btrfs/file.c b/trunk/fs/btrfs/file.c
@@ -289,7 +289,7 @@ static int dirty_and_release_pages(struct btrfs_trans_handle *trans,
 	 */
 	inline_size = end_pos;
 	if (isize >= BTRFS_MAX_INLINE_DATA_SIZE(root) ||
-	    inline_size > 16384 ||
+	    inline_size > 8192 ||
 	    inline_size >= BTRFS_MAX_INLINE_DATA_SIZE(root)) {
 		u64 last_end;