diff mbox series

f2fs-tools: use proper address entry count for direct nodes

Message ID 20231003230155.355807-1-daeho43@gmail.com
State New
Headers
Series f2fs-tools: use proper address entry count for direct nodes |

Commit Message

Daeho Jeong Oct. 3, 2023, 11:01 p.m. UTC 
  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(-)

Comments

Jaegeuk Kim Oct. 4, 2023, 11:26 p.m. UTC | #1 
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(struct f2fs_sb_info *sbi,
>  	fsck->chk.valid_blk_cnt--;
>  	f2fs_clear_main_bitmap(sbi, ni.blk_addr);
>  
> -	for (i = 0; i < ADDRS_PER_BLOCK(&node->i); i++) {
> +	for (i = 0; i < DEF_ADDRS_PER_BLOCK; i++) {

It seems we need to use the inode block passing by fsck_failed_reconnect_file().

>  		addr = le32_to_cpu(node->dn.addr[i]);
>  		if (!addr)
>  			continue;

3012                         fsck->chk.valid_blk_cnt--;
3013                         if (addr == NEW_ADDR)

And, we also need to skip if addr == COMPRESS_ADDR here?

3014                                 continue;
3015                         f2fs_clear_main_bitmap(sbi, addr);
3016                 }

> -- 
> 2.42.0.582.g8ccd20d70d-goog
Daeho Jeong Oct. 4, 2023, 11:37 p.m. UTC | #2 
On Wed, Oct 4, 2023 at 4:26 PM Jaegeuk Kim <jaegeuk@kernel.org> wrote:
>
> 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(struct f2fs_sb_info *sbi,
> >       fsck->chk.valid_blk_cnt--;
> >       f2fs_clear_main_bitmap(sbi, ni.blk_addr);
> >
> > -     for (i = 0; i < ADDRS_PER_BLOCK(&node->i); i++) {
> > +     for (i = 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 = le32_to_cpu(node->dn.addr[i]);
> >               if (!addr)
> >                       continue;
>
> 3012                         fsck->chk.valid_blk_cnt--;
> 3013                         if (addr == NEW_ADDR)
>
> And, we also need to skip if addr == COMPRESS_ADDR here?
>
> 3014                                 continue;
> 3015                         f2fs_clear_main_bitmap(sbi, addr);
> 3016                 }
>
> > --
> > 2.42.0.582.g8ccd20d70d-goog
Jaegeuk Kim Oct. 4, 2023, 11:55 p.m. UTC | #3 
On 10/04, Daeho Jeong wrote:
> On Wed, Oct 4, 2023 at 4:26 PM Jaegeuk Kim <jaegeuk@kernel.org> wrote:
> >
> > 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(struct f2fs_sb_info *sbi,
> > >       fsck->chk.valid_blk_cnt--;
> > >       f2fs_clear_main_bitmap(sbi, ni.blk_addr);
> > >
> > > -     for (i = 0; i < ADDRS_PER_BLOCK(&node->i); i++) {
> > > +     for (i = 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?

 523 unsigned int addrs_per_block(struct f2fs_inode *i)
 524 {
 525         if (!LINUX_S_ISREG(le16_to_cpu(i->i_mode)) ||
 526                         !(le32_to_cpu(i->i_flags) & F2FS_COMPR_FL))
 527                 return DEF_ADDRS_PER_BLOCK;
 528         return ALIGN_DOWN(DEF_ADDRS_PER_BLOCK, 1 << i->i_log_cluster_size);
 529 }

If the inode is compressed, it seems it has to be aligned to cluster size.

> 
> >
> > >               addr = le32_to_cpu(node->dn.addr[i]);
> > >               if (!addr)
> > >                       continue;
> >
> > 3012                         fsck->chk.valid_blk_cnt--;
> > 3013                         if (addr == NEW_ADDR)
> >
> > And, we also need to skip if addr == COMPRESS_ADDR here?
> >
> > 3014                                 continue;
> > 3015                         f2fs_clear_main_bitmap(sbi, addr);
> > 3016                 }
> >
> > > --
> > > 2.42.0.582.g8ccd20d70d-goog
Daeho Jeong Oct. 5, 2023, 12:04 a.m. UTC | #4 
On Wed, Oct 4, 2023 at 4:55 PM Jaegeuk Kim <jaegeuk@kernel.org> wrote:
>
> On 10/04, Daeho Jeong wrote:
> > On Wed, Oct 4, 2023 at 4:26 PM Jaegeuk Kim <jaegeuk@kernel.org> wrote:
> > >
> > > 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(struct f2fs_sb_info *sbi,
> > > >       fsck->chk.valid_blk_cnt--;
> > > >       f2fs_clear_main_bitmap(sbi, ni.blk_addr);
> > > >
> > > > -     for (i = 0; i < ADDRS_PER_BLOCK(&node->i); i++) {
> > > > +     for (i = 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?
>
>  523 unsigned int addrs_per_block(struct f2fs_inode *i)
>  524 {
>  525         if (!LINUX_S_ISREG(le16_to_cpu(i->i_mode)) ||
>  526                         !(le32_to_cpu(i->i_flags) & F2FS_COMPR_FL))
>  527                 return DEF_ADDRS_PER_BLOCK;
>  528         return ALIGN_DOWN(DEF_ADDRS_PER_BLOCK, 1 << i->i_log_cluster_size);
>  529 }
>
> If the inode is compressed, it seems it has to be aligned to cluster size.

makes sense. Thanks~!

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

Patch

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(struct f2fs_sb_info *sbi,
 	fsck->chk.valid_blk_cnt--;
 	f2fs_clear_main_bitmap(sbi, ni.blk_addr);
 
-	for (i = 0; i < ADDRS_PER_BLOCK(&node->i); i++) {
+	for (i = 0; i < DEF_ADDRS_PER_BLOCK; i++) {
 		addr = le32_to_cpu(node->dn.addr[i]);
 		if (!addr)
 			continue;