Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 as permitted sender) client-ip=23.128.96.35;
MIME-Version: 1.0
References: <20231003230155.355807-1-daeho43@gmail.com> <ZR30mNQEyRjzr0jm@google.com>
In-Reply-To: <ZR30mNQEyRjzr0jm@google.com>
From:   Daeho Jeong <daeho43@gmail.com>
Date:   Wed, 4 Oct 2023 16:37:20 -0700
Message-ID: <CACOAw_zSvAPTREb0dSv6srRuxuKxDZp4rMhLyWTk+uJ3WKSWKA@mail.gmail.com>
Subject: Re: [PATCH] f2fs-tools: use proper address entry count for direct nodes
To:     Jaegeuk Kim <jaegeuk@kernel.org>
Cc:     linux-kernel@vger.kernel.org,
        linux-f2fs-devel@lists.sourceforge.net, kernel-team@android.com,
        Daeho Jeong <daehojeong@google.com>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
Precedence: bulk

On Wed, Oct 4, 2023 at 4:26=E2=80=AFPM Jaegeuk Kim <jaegeuk@kernel.org> wro=
te:
>
> On 10/03, Daeho Jeong wrote:
> > From: Daeho Jeong <daehojeong@google.com>
> >
> > For direct nodes, we have to use DEF_ADDRS_PER_BLOCK.
> >
> > Signed-off-by: Daeho Jeong <daehojeong@google.com>
> > ---
> >  fsck/fsck.c | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/fsck/fsck.c b/fsck/fsck.c
> > index 78ffdb6..56a7d31 100644
> > --- a/fsck/fsck.c
> > +++ b/fsck/fsck.c
> > @@ -2894,7 +2894,7 @@ static void fsck_failed_reconnect_file_dnode(stru=
ct f2fs_sb_info *sbi,
> >       fsck->chk.valid_blk_cnt--;
> >       f2fs_clear_main_bitmap(sbi, ni.blk_addr);
> >
> > -     for (i =3D 0; i < ADDRS_PER_BLOCK(&node->i); i++) {
> > +     for (i =3D 0; i < DEF_ADDRS_PER_BLOCK; i++) {
>
> It seems we need to use the inode block passing by fsck_failed_reconnect_=
file().

This function is for direct nodes. Is it correct to use inode block here?

>
> >               addr =3D le32_to_cpu(node->dn.addr[i]);
> >               if (!addr)
> >                       continue;
>
> 3012                         fsck->chk.valid_blk_cnt--;
> 3013                         if (addr =3D=3D NEW_ADDR)
>
> And, we also need to skip if addr =3D=3D COMPRESS_ADDR here?
>
> 3014                                 continue;
> 3015                         f2fs_clear_main_bitmap(sbi, addr);
> 3016                 }
>
> > --
> > 2.42.0.582.g8ccd20d70d-goog