From: Timofey Titovets <nefelim4ag@gmail.com>
To: linux-btrfs@vger.kernel.org
Cc: Timofey Titovets <nefelim4ag@gmail.com>
Subject: [PATCH v2 2/2] Btrfs: compression must free at least PAGE_SIZE
Date: Sat, 20 May 2017 19:49:53 +0300 [thread overview]
Message-ID: <20170520164953.7344-3-nefelim4ag@gmail.com> (raw)
In-Reply-To: <20170520164953.7344-1-nefelim4ag@gmail.com>
Btrfs already skip store of data where compression didn't free at least one byte.
So make logic better and make check that compression free at least one PAGE_SIZE,
because in another case it useless to store this data compressed
Signed-off-by: Timofey Titovets <nefelim4ag@gmail.com>
---
fs/btrfs/lzo.c | 5 ++++-
fs/btrfs/zlib.c | 3 ++-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/fs/btrfs/lzo.c b/fs/btrfs/lzo.c
index bd0b0938..7f38bc3c 100644
--- a/fs/btrfs/lzo.c
+++ b/fs/btrfs/lzo.c
@@ -229,8 +229,11 @@ static int lzo_compress_pages(struct list_head *ws,
in_len = min(bytes_left, PAGE_SIZE);
}
- if (tot_out > tot_in)
+ /* Compression must save at least one PAGE_SIZE */
+ if (tot_out + PAGE_SIZE => tot_in) {
+ ret = -E2BIG;
goto out;
+ }
/* store the size of all chunks of compressed data */
cpage_out = kmap(pages[0]);
diff --git a/fs/btrfs/zlib.c b/fs/btrfs/zlib.c
index 135b1082..2b04259b 100644
--- a/fs/btrfs/zlib.c
+++ b/fs/btrfs/zlib.c
@@ -191,7 +191,8 @@ static int zlib_compress_pages(struct list_head *ws,
goto out;
}
- if (workspace->strm.total_out >= workspace->strm.total_in) {
+ /* Compression must save at least one PAGE_SIZE */
+ if (workspace->strm.total_out + PAGE_SIZE >= workspace->strm.total_in) {
ret = -E2BIG;
goto out;
}
--
2.13.0
next prev parent reply other threads:[~2017-05-20 16:50 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-05-20 16:49 [PATCH v2 0/2] Btrfs: compression fixes Timofey Titovets
2017-05-20 16:49 ` [PATCH v2 1/2] Btrfs: lzo.c pr_debug() deflate->lzo Timofey Titovets
2017-05-20 16:49 ` Timofey Titovets [this message]
2017-05-20 17:14 ` [PATCH v2 2/2] Btrfs: compression must free at least PAGE_SIZE Kai Krakow
2017-05-20 18:30 ` Timofey Titovets
2017-05-21 1:38 ` Duncan
2017-05-21 16:54 ` Timofey Titovets
2017-05-21 17:30 ` Roman Mamedov
2017-05-21 22:32 ` Timofey Titovets
2017-05-22 9:44 ` Duncan
2017-05-23 6:05 ` kbuild test robot
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170520164953.7344-3-nefelim4ag@gmail.com \
--to=nefelim4ag@gmail.com \
--cc=linux-btrfs@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).