Btrfs: fix unnecessary warning when the fragments make the space alloc fail
authorMiao Xie <miaox@cn.fujitsu.com>
Wed, 12 Sep 2012 05:27:35 +0000 (23:27 -0600)
committerChris Mason <chris.mason@fusionio.com>
Mon, 1 Oct 2012 19:19:20 +0000 (15:19 -0400)
When we wrote some data by compress mode into a btrfs filesystem which was full
of the fragments, the kernel will report:
BTRFS warning (device xxx): Aborting unused transaction.

The reason is:
We can not find a long enough free space to store the compressed data because
of the fragmentary free space, and the compressed data can not be splited,
so the kernel outputed the above message.

In fact, btrfs can deal with this problem very well: it fall back to
uncompressed IO, split the uncompressed data into small ones, and then
store them into to the fragmentary free space. So we shouldn't output the
above warning message.

Signed-off-by: Miao Xie <miaox@cn.fujitsu.com>
fs/btrfs/inode.c

index 406666cb6156189d5623246d4ae2271a96116e83..d41e467b4aa2d527226d82bb2ec3c7d8b2445931 100644 (file)
@@ -662,7 +662,7 @@ retry:
                                           async_extent->compressed_size,
                                           async_extent->compressed_size,
                                           0, alloc_hint, &ins, 1);
-                       if (ret)
+                       if (ret && ret != -ENOSPC)
                                btrfs_abort_transaction(trans, root, ret);
                        btrfs_end_transaction(trans, root);
                }