Minor fixups from 3.16-rc1
Hi Chris,
two minor fixups for patches merged in rc1
You can also pull that from
git://repo.or.cz/linux-2.6/btrfs-unstable.git for-chris/3.16-rc2
with top commit b934864cc8b08eb358748b06468b9cca64026c1e, based on current for-linus 8408c716d7a4ddd5954ce33f53a7d3cd2876cf65
Thanks.
David Sterba (2):
btrfs: remove stale comment from btrfs_flush_all_pending_stuffs
btrfs: use E2BIG instead of EIO if compression does not help
fs/btrfs/transaction.c | 5 ----- fs/btrfs/zlib.c | 2 +- 2 files changed, 1 insertions(+), 6 deletions(-)
Signature · 1 line
1.7.9
PATCH 1/2 btrfs: remove stale comment from btrfs_flush_all_pending_stuffs
Commit fcebe4562dec83b3f8d3088d77584727b09130b2 (Btrfs: rework qgroup accounting) removed the qgroup accounting after delayed refs.
--- fs/btrfs/transaction.c | 5 ----- 1 files changed, 0 insertions(+), 5 deletions(-)
fs/btrfs/transaction.c +0 -5
@@ -1615,11 +1615,6 @@ static int btrfs_flush_all_pending_stuffs(struct btrfs_trans_handle *trans,int ret; ret =btrfs_run_delayed_items (trans, root); -/* -* running the delayed items may have added new refs. account -* them now so that they hinder processing of more delayed refs -* as little as possible. -*/ if (ret)return ret;
Signature · 1 line
1.7.9
PATCH 2/2 btrfs: use E2BIG instead of EIO if compression does not help
In reply to David SterbaReturn codes got updated in 60e1975acb48fc3d74a3422b21dde74c977ac3d5 (btrfs: return errno instead of -1 from compression)
lzo wrapper returns E2BIG in this case, do the same for zlib.
--- fs/btrfs/zlib.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
fs/btrfs/zlib.c +1 -1
@@ -136,7 +136,7 @@ static int zlib_compress_pages(struct list_head *ws,if (workspace->def_strm.total_in >8192 && workspace->def_strm.total_in < workspace->def_strm.total_out) { - ret = -EIO ; + ret = -E2BIG ; goto out; }/* we need another page for writing out. Test this
Signature · 1 line
1.7.9