From: Gao Xiang <hsiangkao@linux.alibaba.com>
To: linux-erofs@lists.ozlabs.org
Cc: Gao Xiang <hsiangkao@linux.alibaba.com>,
Yifan Zhao <zhaoyifan@sjtu.edu.cn>
Subject: [PATCH] erofs-utils: lib: use dummy_pivot to dedupe the beginnings of files
Date: Mon, 15 Jan 2024 23:05:50 +0800 [thread overview]
Message-ID: <20240115150550.1961455-1-hsiangkao@linux.alibaba.com> (raw)
The beginnings of files are incorrectly skipped for deduplication, which
causes unexpected image size regression. Fix it.
Reported-by: Yifan Zhao <zhaoyifan@sjtu.edu.cn>
Fixes: 8ead5f8bd38c ("erofs-utils: lib: generate compression indexes in memory first")
Signed-off-by: Gao Xiang <hsiangkao@linux.alibaba.com>
---
lib/compress.c | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/lib/compress.c b/lib/compress.c
index 8f61f92..22782cb 100644
--- a/lib/compress.c
+++ b/lib/compress.c
@@ -200,9 +200,16 @@ static bool z_erofs_need_refill(struct z_erofs_vle_compress_ctx *ctx)
return true;
}
+static struct z_erofs_extent_item dummy_pivot = {
+ .e.length = 0
+};
+
static void z_erofs_commit_extent(struct z_erofs_vle_compress_ctx *ctx,
struct z_erofs_extent_item *ei)
{
+ if (ei == &dummy_pivot)
+ return;
+
list_add_tail(&ei->list, &ctx->extents);
ctx->clusterofs = (ctx->clusterofs + ei->e.length) &
(erofs_blksiz(ctx->inode->sbi) - 1);
@@ -980,7 +987,7 @@ int erofs_write_compressed_file(struct erofs_inode *inode, int fd)
ctx.metacur = compressmeta + Z_EROFS_LEGACY_MAP_HEADER_SIZE;
ctx.head = ctx.tail = 0;
ctx.clusterofs = 0;
- ctx.pivot = NULL;
+ ctx.pivot = &dummy_pivot;
init_list_head(&ctx.extents);
ctx.remaining = inode->i_size - inode->fragment_size;
ctx.fix_dedupedfrag = false;
--
2.39.3
reply other threads:[~2024-01-15 15:06 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20240115150550.1961455-1-hsiangkao@linux.alibaba.com \
--to=hsiangkao@linux.alibaba.com \
--cc=linux-erofs@lists.ozlabs.org \
--cc=zhaoyifan@sjtu.edu.cn \
/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 read-only IMAP folder(s) and NNTP newsgroup(s).