* [PATCH] f2fs: fix wrong bfree and bavail
@ 2017-09-05 21:06 Jaegeuk Kim
2017-09-05 21:20 ` Andreas Dilger
2017-09-06 3:07 ` Chao Yu
0 siblings, 2 replies; 6+ messages in thread
From: Jaegeuk Kim @ 2017-09-05 21:06 UTC (permalink / raw)
To: linux-kernel, linux-fsdevel, linux-f2fs-devel; +Cc: Jaegeuk Kim, stable
This patch fixes bavail and bfree finally.
long f_bfree; /* free blocks in fs */
long f_bavail; /* free blocks avail to non-superuser */
So, bfree represents all the reserved blocks, while bavail does the space only
visible to normal user.
Fix: 3e6d0b4d9c1c ("f2fs: fix incorrect f_bfree calculation in ->statfs")
Cc: <stable@vger.kernel.org> # 4.8+
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
---
fs/f2fs/super.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c
index 7e29db227910..17cca4cb93af 100644
--- a/fs/f2fs/super.c
+++ b/fs/f2fs/super.c
@@ -955,8 +955,8 @@ static int f2fs_statfs(struct dentry *dentry, struct kstatfs *buf)
buf->f_bsize = sbi->blocksize;
buf->f_blocks = total_count - start_count;
- buf->f_bfree = user_block_count - valid_user_blocks(sbi) + ovp_count;
- buf->f_bavail = user_block_count - valid_user_blocks(sbi) -
+ buf->f_bfree = user_block_count - valid_user_blocks(sbi);
+ buf->f_bavail = user_block_count - valid_user_blocks(sbi) - ovp_count -
sbi->reserved_blocks;
avail_node_count = sbi->total_node_count - F2FS_RESERVED_NODE_NUM;
--
2.14.0.rc1.383.gd1ce394fe2-goog
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH] f2fs: fix wrong bfree and bavail
2017-09-05 21:06 [PATCH] f2fs: fix wrong bfree and bavail Jaegeuk Kim
@ 2017-09-05 21:20 ` Andreas Dilger
2017-09-05 22:41 ` Jaegeuk Kim
2017-09-06 3:07 ` Chao Yu
1 sibling, 1 reply; 6+ messages in thread
From: Andreas Dilger @ 2017-09-05 21:20 UTC (permalink / raw)
To: Jaegeuk Kim; +Cc: linux-kernel, linux-fsdevel, linux-f2fs-devel, stable
[-- Attachment #1: Type: text/plain, Size: 1514 bytes --]
On Sep 5, 2017, at 3:06 PM, Jaegeuk Kim <jaegeuk@kernel.org> wrote:
>
> This patch fixes bavail and bfree finally.
>
> long f_bfree; /* free blocks in fs */
> long f_bavail; /* free blocks avail to non-superuser */
>
> So, bfree represents all the reserved blocks, while bavail does the space only
> visible to normal user.
>
> Fix: 3e6d0b4d9c1c ("f2fs: fix incorrect f_bfree calculation in ->statfs")
> Cc: <stable@vger.kernel.org> # 4.8+
> Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
> ---
> fs/f2fs/super.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c
> index 7e29db227910..17cca4cb93af 100644
> --- a/fs/f2fs/super.c
> +++ b/fs/f2fs/super.c
> @@ -955,8 +955,8 @@ static int f2fs_statfs(struct dentry *dentry, struct kstatfs *buf)
> buf->f_bsize = sbi->blocksize;
>
> buf->f_blocks = total_count - start_count;
> - buf->f_bfree = user_block_count - valid_user_blocks(sbi) + ovp_count;
> - buf->f_bavail = user_block_count - valid_user_blocks(sbi) -
> + buf->f_bfree = user_block_count - valid_user_blocks(sbi);
> + buf->f_bavail = user_block_count - valid_user_blocks(sbi) - ovp_count -
> sbi->reserved_blocks;
To keep the statfs data more consistent, you could use:
buf->f_bavail = buf->f_bfree - ovp_count - sbi->reserved_blocks;
That avoids the extra subtraction, and avoids (minor) issues if these values
change while this syscall is running.
Cheers, Andreas
[-- Attachment #2: Message signed with OpenPGP --]
[-- Type: application/pgp-signature, Size: 195 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH] f2fs: fix wrong bfree and bavail
2017-09-05 21:20 ` Andreas Dilger
@ 2017-09-05 22:41 ` Jaegeuk Kim
0 siblings, 0 replies; 6+ messages in thread
From: Jaegeuk Kim @ 2017-09-05 22:41 UTC (permalink / raw)
To: Andreas Dilger; +Cc: linux-kernel, linux-fsdevel, linux-f2fs-devel, stable
On 09/05, Andreas Dilger wrote:
> On Sep 5, 2017, at 3:06 PM, Jaegeuk Kim <jaegeuk@kernel.org> wrote:
> >
> > This patch fixes bavail and bfree finally.
> >
> > long f_bfree; /* free blocks in fs */
> > long f_bavail; /* free blocks avail to non-superuser */
> >
> > So, bfree represents all the reserved blocks, while bavail does the space only
> > visible to normal user.
> >
> > Fix: 3e6d0b4d9c1c ("f2fs: fix incorrect f_bfree calculation in ->statfs")
> > Cc: <stable@vger.kernel.org> # 4.8+
> > Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
> > ---
> > fs/f2fs/super.c | 4 ++--
> > 1 file changed, 2 insertions(+), 2 deletions(-)
> >
> > diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c
> > index 7e29db227910..17cca4cb93af 100644
> > --- a/fs/f2fs/super.c
> > +++ b/fs/f2fs/super.c
> > @@ -955,8 +955,8 @@ static int f2fs_statfs(struct dentry *dentry, struct kstatfs *buf)
> > buf->f_bsize = sbi->blocksize;
> >
> > buf->f_blocks = total_count - start_count;
> > - buf->f_bfree = user_block_count - valid_user_blocks(sbi) + ovp_count;
> > - buf->f_bavail = user_block_count - valid_user_blocks(sbi) -
> > + buf->f_bfree = user_block_count - valid_user_blocks(sbi);
> > + buf->f_bavail = user_block_count - valid_user_blocks(sbi) - ovp_count -
> > sbi->reserved_blocks;
>
> To keep the statfs data more consistent, you could use:
>
> buf->f_bavail = buf->f_bfree - ovp_count - sbi->reserved_blocks;
>
> That avoids the extra subtraction, and avoids (minor) issues if these values
> change while this syscall is running.
Much better. Thank you so much for correcting me.
>
> Cheers, Andreas
>
>
>
>
>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] f2fs: fix wrong bfree and bavail
2017-09-05 21:06 [PATCH] f2fs: fix wrong bfree and bavail Jaegeuk Kim
2017-09-05 21:20 ` Andreas Dilger
@ 2017-09-06 3:07 ` Chao Yu
2017-09-06 3:10 ` Jaegeuk Kim
1 sibling, 1 reply; 6+ messages in thread
From: Chao Yu @ 2017-09-06 3:07 UTC (permalink / raw)
To: Jaegeuk Kim, linux-kernel, linux-fsdevel, linux-f2fs-devel; +Cc: stable
On 2017/9/6 5:06, Jaegeuk Kim wrote:
> This patch fixes bavail and bfree finally.
>
> long f_bfree; /* free blocks in fs */
> long f_bavail; /* free blocks avail to non-superuser */
>
> So, bfree represents all the reserved blocks, while bavail does the space only
> visible to normal user.
>
> Fix: 3e6d0b4d9c1c ("f2fs: fix incorrect f_bfree calculation in ->statfs")
> Cc: <stable@vger.kernel.org> # 4.8+
> Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
> ---
> fs/f2fs/super.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c
> index 7e29db227910..17cca4cb93af 100644
> --- a/fs/f2fs/super.c
> +++ b/fs/f2fs/super.c
> @@ -955,8 +955,8 @@ static int f2fs_statfs(struct dentry *dentry, struct kstatfs *buf)
> buf->f_bsize = sbi->blocksize;
>
> buf->f_blocks = total_count - start_count;
> - buf->f_bfree = user_block_count - valid_user_blocks(sbi) + ovp_count;
> - buf->f_bavail = user_block_count - valid_user_blocks(sbi) -
> + buf->f_bfree = user_block_count - valid_user_blocks(sbi);
> + buf->f_bavail = user_block_count - valid_user_blocks(sbi) - ovp_count -
set_cp(user_block_count, ((get_cp(free_segment_count) + 6 -
get_cp(overprov_segment_count)) * c.blks_per_seg));
As we calculated in mkfs, we have removed ovp_count in user_block_count, so
shouldn't we add ovp_count for f_bfree here?
Thanks,
> sbi->reserved_blocks;
>
> avail_node_count = sbi->total_node_count - F2FS_RESERVED_NODE_NUM;
>
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH] f2fs: fix wrong bfree and bavail
2017-09-06 3:07 ` Chao Yu
@ 2017-09-06 3:10 ` Jaegeuk Kim
2017-09-06 3:19 ` Chao Yu
0 siblings, 1 reply; 6+ messages in thread
From: Jaegeuk Kim @ 2017-09-06 3:10 UTC (permalink / raw)
To: Chao Yu; +Cc: linux-kernel, linux-fsdevel, linux-f2fs-devel, stable
On 09/06, Chao Yu wrote:
> On 2017/9/6 5:06, Jaegeuk Kim wrote:
> > This patch fixes bavail and bfree finally.
> >
> > long f_bfree; /* free blocks in fs */
> > long f_bavail; /* free blocks avail to non-superuser */
> >
> > So, bfree represents all the reserved blocks, while bavail does the space only
> > visible to normal user.
> >
> > Fix: 3e6d0b4d9c1c ("f2fs: fix incorrect f_bfree calculation in ->statfs")
> > Cc: <stable@vger.kernel.org> # 4.8+
> > Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
> > ---
> > fs/f2fs/super.c | 4 ++--
> > 1 file changed, 2 insertions(+), 2 deletions(-)
> >
> > diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c
> > index 7e29db227910..17cca4cb93af 100644
> > --- a/fs/f2fs/super.c
> > +++ b/fs/f2fs/super.c
> > @@ -955,8 +955,8 @@ static int f2fs_statfs(struct dentry *dentry, struct kstatfs *buf)
> > buf->f_bsize = sbi->blocksize;
> >
> > buf->f_blocks = total_count - start_count;
> > - buf->f_bfree = user_block_count - valid_user_blocks(sbi) + ovp_count;
> > - buf->f_bavail = user_block_count - valid_user_blocks(sbi) -
> > + buf->f_bfree = user_block_count - valid_user_blocks(sbi);
> > + buf->f_bavail = user_block_count - valid_user_blocks(sbi) - ovp_count -
>
> set_cp(user_block_count, ((get_cp(free_segment_count) + 6 -
> get_cp(overprov_segment_count)) * c.blks_per_seg));
>
> As we calculated in mkfs, we have removed ovp_count in user_block_count, so
> shouldn't we add ovp_count for f_bfree here?
Hehe, I already dropped this. :P
It seems like something wrong with df in android.
>
> Thanks,
>
> > sbi->reserved_blocks;
> >
> > avail_node_count = sbi->total_node_count - F2FS_RESERVED_NODE_NUM;
> >
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH] f2fs: fix wrong bfree and bavail
2017-09-06 3:10 ` Jaegeuk Kim
@ 2017-09-06 3:19 ` Chao Yu
0 siblings, 0 replies; 6+ messages in thread
From: Chao Yu @ 2017-09-06 3:19 UTC (permalink / raw)
To: Jaegeuk Kim; +Cc: linux-kernel, linux-fsdevel, linux-f2fs-devel, stable
On 2017/9/6 11:10, Jaegeuk Kim wrote:
> On 09/06, Chao Yu wrote:
>> On 2017/9/6 5:06, Jaegeuk Kim wrote:
>>> This patch fixes bavail and bfree finally.
>>>
>>> long f_bfree; /* free blocks in fs */
>>> long f_bavail; /* free blocks avail to non-superuser */
>>>
>>> So, bfree represents all the reserved blocks, while bavail does the space only
>>> visible to normal user.
>>>
>>> Fix: 3e6d0b4d9c1c ("f2fs: fix incorrect f_bfree calculation in ->statfs")
>>> Cc: <stable@vger.kernel.org> # 4.8+
>>> Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
>>> ---
>>> fs/f2fs/super.c | 4 ++--
>>> 1 file changed, 2 insertions(+), 2 deletions(-)
>>>
>>> diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c
>>> index 7e29db227910..17cca4cb93af 100644
>>> --- a/fs/f2fs/super.c
>>> +++ b/fs/f2fs/super.c
>>> @@ -955,8 +955,8 @@ static int f2fs_statfs(struct dentry *dentry, struct kstatfs *buf)
>>> buf->f_bsize = sbi->blocksize;
>>>
>>> buf->f_blocks = total_count - start_count;
>>> - buf->f_bfree = user_block_count - valid_user_blocks(sbi) + ovp_count;
>>> - buf->f_bavail = user_block_count - valid_user_blocks(sbi) -
>>> + buf->f_bfree = user_block_count - valid_user_blocks(sbi);
>>> + buf->f_bavail = user_block_count - valid_user_blocks(sbi) - ovp_count -
>>
>> set_cp(user_block_count, ((get_cp(free_segment_count) + 6 -
>> get_cp(overprov_segment_count)) * c.blks_per_seg));
>>
>> As we calculated in mkfs, we have removed ovp_count in user_block_count, so
>> shouldn't we add ovp_count for f_bfree here?
>
> Hehe, I already dropped this. :P
Alright. :)
> It seems like something wrong with df in android.
Maybe its version is too old?
Thanks,
>
>>
>> Thanks,
>>
>>> sbi->reserved_blocks;
>>>
>>> avail_node_count = sbi->total_node_count - F2FS_RESERVED_NODE_NUM;
>>>
>
> .
>
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2017-09-06 3:19 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-09-05 21:06 [PATCH] f2fs: fix wrong bfree and bavail Jaegeuk Kim
2017-09-05 21:20 ` Andreas Dilger
2017-09-05 22:41 ` Jaegeuk Kim
2017-09-06 3:07 ` Chao Yu
2017-09-06 3:10 ` Jaegeuk Kim
2017-09-06 3:19 ` Chao Yu
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).