From: Gao Xiang <hsiangkao@linux.alibaba.com>
To: Yue Hu <zbestahu@gmail.com>, linux-erofs@lists.ozlabs.org
Cc: sunshijie@xiaomi.com, huyue2@coolpad.com, zhangwen@coolpad.com
Subject: Re: [PATCH 1/2] erofs-utils: dump: read packed inode only by valid packed_nid
Date: Fri, 2 Jun 2023 17:43:09 +0800 [thread overview]
Message-ID: <03a4db6b-5134-ccd1-847c-90eb8a1b341f@linux.alibaba.com> (raw)
In-Reply-To: <b07be6197e879b8200b4c25f91957d6a206dc143.1685697802.git.huyue2@coolpad.com>
On 2023/6/2 17:37, Yue Hu wrote:
> From: Yue Hu <huyue2@coolpad.com>
>
> Since dedupe feature is also using the same feature bit as fragments.
> Meanwhile, add missing dedupe feature to feature_lists[].
>
> Fixes: a6336feefe37 ("erofs-utils: dump: support fragments")
> Signed-off-by: Yue Hu <huyue2@coolpad.com>
We should check both
erofs_sb_has_fragments() && sbi.packed_nid > 0 here.
Thanks,
Gao Xiang
> ---
> dump/main.c | 5 +++--
> 1 file changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/dump/main.c b/dump/main.c
> index fd1923f..b9aa0f5 100644
> --- a/dump/main.c
> +++ b/dump/main.c
> @@ -99,6 +99,7 @@ static struct erofsdump_feature feature_lists[] = {
> { false, EROFS_FEATURE_INCOMPAT_DEVICE_TABLE, "device_table" },
> { false, EROFS_FEATURE_INCOMPAT_ZTAILPACKING, "ztailpacking" },
> { false, EROFS_FEATURE_INCOMPAT_FRAGMENTS, "fragments" },
> + { false, EROFS_FEATURE_INCOMPAT_DEDUPE, "dedupe" },
> };
>
> static int erofsdump_readdir(struct erofs_dir_context *ctx);
> @@ -273,7 +274,7 @@ static int erofsdump_read_packed_inode(void)
> erofs_off_t occupied_size = 0;
> struct erofs_inode vi = { .nid = sbi.packed_nid };
>
> - if (!erofs_sb_has_fragments())
> + if (!sbi.packed_nid)
> return 0;
>
> err = erofs_read_inode_from_disk(&vi);
> @@ -605,7 +606,7 @@ static void erofsdump_show_superblock(void)
> sbi.xattr_blkaddr);
> fprintf(stdout, "Filesystem root nid: %llu\n",
> sbi.root_nid | 0ULL);
> - if (erofs_sb_has_fragments())
> + if (sbi.packed_nid > 0)
> fprintf(stdout, "Filesystem packed nid: %llu\n",
> sbi.packed_nid | 0ULL);
> fprintf(stdout, "Filesystem inode count: %llu\n",
prev parent reply other threads:[~2023-06-02 9:43 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-06-02 9:37 [PATCH 1/2] erofs-utils: dump: read packed inode only by valid packed_nid Yue Hu
2023-06-02 9:37 ` [PATCH 2/2] erofs-utils: fsck: check " Yue Hu
2023-06-02 9:42 ` Gao Xiang
2023-06-02 9:43 ` 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=03a4db6b-5134-ccd1-847c-90eb8a1b341f@linux.alibaba.com \
--to=hsiangkao@linux.alibaba.com \
--cc=huyue2@coolpad.com \
--cc=linux-erofs@lists.ozlabs.org \
--cc=sunshijie@xiaomi.com \
--cc=zbestahu@gmail.com \
--cc=zhangwen@coolpad.com \
/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).