[PATCH] erofs-utils: add missing block counting

[PATCH] erofs-utils: add missing block counting

[Noboru Asai]

Add missing block counting when the data to be inlined is not inlined.

Signed-off-by: Noboru Asai <asai@sijam.com>
---
 lib/inode.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/inode.c b/lib/inode.c
index cf22bbe..727dcee 100644
--- a/lib/inode.c
+++ b/lib/inode.c
@@ -840,6 +840,7 @@ static int erofs_write_tail_end(struct erofs_inode *inode)
 		inode->idata_size = 0;
 		free(inode->idata);
 		inode->idata = NULL;
+		inode->u.i_blocks += 1;
 
 		erofs_droid_blocklist_write_tail_end(inode, erofs_blknr(sbi, pos));
 	}
-- 
2.44.0

Re: [PATCH] erofs-utils: add missing block counting

[Gao Xiang]

Hi Noboru,

On 2024/4/24 12:34, Noboru Asai wrote:
> Add missing block counting when the data to be inlined is not inlined.
> 
> Signed-off-by: Noboru Asai <asai@sijam.com>


Thanks for catching this! Could we fixup this at
erofs_prepare_tail_block()?

since currently it the place to allocate a tail block for this.

Thanks,
Gao Xiang

> ---
>   lib/inode.c | 1 +
>   1 file changed, 1 insertion(+)
> 
> diff --git a/lib/inode.c b/lib/inode.c
> index cf22bbe..727dcee 100644
> --- a/lib/inode.c
> +++ b/lib/inode.c
> @@ -840,6 +840,7 @@ static int erofs_write_tail_end(struct erofs_inode *inode)
>   		inode->idata_size = 0;
>   		free(inode->idata);
>   		inode->idata = NULL;
> +		inode->u.i_blocks += 1;
>   
>   		erofs_droid_blocklist_write_tail_end(inode, erofs_blknr(sbi, pos));
>   	}

Re: [PATCH] erofs-utils: add missing block counting

[Noboru Asai]

Hi Gao,

I think that erofs_balloc() and erofs_bh_baloon() function in
erofs_write_tail_end()
also alloc a tail block, Is it not true?

2024年4月24日(水) 13:54 Gao Xiang <hsiangkao@linux.alibaba.com>:
>
> Hi Noboru,
>
> On 2024/4/24 12:34, Noboru Asai wrote:
> > Add missing block counting when the data to be inlined is not inlined.
> >
> > Signed-off-by: Noboru Asai <asai@sijam.com>
>
>
> Thanks for catching this! Could we fixup this at
> erofs_prepare_tail_block()?
>
> since currently it the place to allocate a tail block for this.
>
> Thanks,
> Gao Xiang
>
> > ---
> >   lib/inode.c | 1 +
> >   1 file changed, 1 insertion(+)
> >
> > diff --git a/lib/inode.c b/lib/inode.c
> > index cf22bbe..727dcee 100644
> > --- a/lib/inode.c
> > +++ b/lib/inode.c
> > @@ -840,6 +840,7 @@ static int erofs_write_tail_end(struct erofs_inode *inode)
> >               inode->idata_size = 0;
> >               free(inode->idata);
> >               inode->idata = NULL;
> > +             inode->u.i_blocks += 1;
> >
> >               erofs_droid_blocklist_write_tail_end(inode, erofs_blknr(sbi, pos));
> >       }

Re: [PATCH] erofs-utils: add missing block counting

[Gao Xiang]

On 2024/4/24 13:33, Noboru Asai wrote:
> Hi Gao,
> 
> I think that erofs_balloc() and erofs_bh_baloon() function in
> erofs_write_tail_end()
> also alloc a tail block, Is it not true?

erofs_prepare_tail_block() is the place to decide the fallback
tail block. But due to some dependency, bh can be allocated in
erofs_write_tail_end() later.

erofs_write_tail_end() is designed for filling tail data, not
decide to get a fallback tail block, anyway.

commit 21d84349e79a ("erofs-utils: rearrange on-disk metadata")
changed the timing due to some dependency as I said before, but
later I need to revisit it.  erofs_prepare_tail_block() is the
original place to decide if a fallback tail block is needed,
that is also true for old versions.

Thanks,
Gao Xiang