From: Gao Xiang <xiang@kernel.org>
To: Yifan Zhao <zhaoyifan@sjtu.edu.cn>
Cc: linux-erofs@lists.ozlabs.org
Subject: Re: [PATCH v2] erofs-utils: fsck: extract chunk-based file with hole correctly
Date: Wed, 24 Apr 2024 14:02:11 +0800 [thread overview]
Message-ID: <ZiigY6wpJDb6SMx9@debian> (raw)
In-Reply-To: <20240422113132.276631-1-zhaoyifan@sjtu.edu.cn>
On Mon, Apr 22, 2024 at 07:31:32PM +0800, Yifan Zhao wrote:
> Currently fsck skips file extraction if it finds that EROFS_MAP_MAPPED
> is unset, which is not the case for chunk-based files with hole. This
> patch handles the corner case correctly.
>
> Signed-off-by: Yifan Zhao <zhaoyifan@sjtu.edu.cn>
I will apply the following version:
From 56e2f73cec3fa45d8b1dd1e9ec571b1f075d2275 Mon Sep 17 00:00:00 2001
From: Yifan Zhao <zhaoyifan@sjtu.edu.cn>
Date: Mon, 22 Apr 2024 19:31:32 +0800
Subject: [PATCH] erofs-utils: fsck: extract chunk-based file with hole correctly
Currently fsck skips file extraction if it finds that EROFS_MAP_MAPPED
is unset, which is not the case for chunk-based files with holes.
This patch handles the corner case correctly.
Signed-off-by: Yifan Zhao <zhaoyifan@sjtu.edu.cn>
Signed-off-by: Gao Xiang <hsiangkao@linux.alibaba.com>
---
fsck/main.c | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/fsck/main.c b/fsck/main.c
index e5c37be..4dcb49d 100644
--- a/fsck/main.c
+++ b/fsck/main.c
@@ -470,9 +470,18 @@ static int erofs_verify_inode_data(struct erofs_inode *inode, int outfd)
pos += map.m_llen;
/* should skip decomp? */
- if (!(map.m_flags & EROFS_MAP_MAPPED) || !fsckcfg.check_decomp)
+ if (map.m_la >= inode->i_size || !fsckcfg.check_decomp)
continue;
+ if (outfd >= 0 && !(map.m_flags & EROFS_MAP_MAPPED)) {
+ ret = lseek(outfd, map.m_llen, SEEK_CUR);
+ if (ret < 0) {
+ ret = -errno;
+ goto out;
+ }
+ continue;
+ }
+
if (map.m_plen > Z_EROFS_PCLUSTER_MAX_SIZE) {
if (compressed) {
erofs_err("invalid pcluster size %" PRIu64 " @ offset %" PRIu64 " of nid %" PRIu64,
--
2.30.2
prev parent reply other threads:[~2024-04-24 6:02 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-22 10:05 [PATCH] erofs-utils: fsck: extract chunk-based file with hole correctly Yifan Zhao
2024-04-22 10:28 ` Gao Xiang
2024-04-22 11:31 ` [PATCH v2] " Yifan Zhao
2024-04-24 6:02 ` Gao Xiang [this message]
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=ZiigY6wpJDb6SMx9@debian \
--to=xiang@kernel.org \
--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).