ext4: report delalloc reserve as non-free in statfs mangled by project quota

Message ID 151756800585.979296.13086151972011935611.stgit@buzz
State New
Headers show
Series
  • ext4: report delalloc reserve as non-free in statfs mangled by project quota
Related show

Commit Message

Konstantin Khlebnikov Feb. 2, 2018, 10:40 a.m.
This reserved space isn't committed yet but cannot be used for allocations.
For userspace it has no difference from used space. XFS already does this.

Signed-off-by: Konstantin Khlebnikov <khlebnikov@yandex-team.ru>
Fixes: 689c958cbe6b ("ext4: add project quota support")
---
 fs/ext4/super.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Comments

Jan Kara Feb. 6, 2018, 1:46 p.m. | #1
On Fri 02-02-18 13:40:05, Konstantin Khlebnikov wrote:
> This reserved space isn't committed yet but cannot be used for allocations.
> For userspace it has no difference from used space. XFS already does this.
> 
> Signed-off-by: Konstantin Khlebnikov <khlebnikov@yandex-team.ru>
> Fixes: 689c958cbe6b ("ext4: add project quota support")

The patch looks good. You can add:

Reviewed-by: Jan Kara <jack@suse.cz>

								Honza

> ---
>  fs/ext4/super.c |    3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/fs/ext4/super.c b/fs/ext4/super.c
> index 5de959fb0244..13ce97b9e820 100644
> --- a/fs/ext4/super.c
> +++ b/fs/ext4/super.c
> @@ -5227,7 +5227,8 @@ static int ext4_statfs_project(struct super_block *sb,
>  		 dquot->dq_dqb.dqb_bsoftlimit :
>  		 dquot->dq_dqb.dqb_bhardlimit) >> sb->s_blocksize_bits;
>  	if (limit && buf->f_blocks > limit) {
> -		curblock = dquot->dq_dqb.dqb_curspace >> sb->s_blocksize_bits;
> +		curblock = (dquot->dq_dqb.dqb_curspace +
> +			    dquot->dq_dqb.dqb_rsvspace) >> sb->s_blocksize_bits;
>  		buf->f_blocks = limit;
>  		buf->f_bfree = buf->f_bavail =
>  			(buf->f_blocks > curblock) ?
>

Patch

diff --git a/fs/ext4/super.c b/fs/ext4/super.c
index 5de959fb0244..13ce97b9e820 100644
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
@@ -5227,7 +5227,8 @@  static int ext4_statfs_project(struct super_block *sb,
 		 dquot->dq_dqb.dqb_bsoftlimit :
 		 dquot->dq_dqb.dqb_bhardlimit) >> sb->s_blocksize_bits;
 	if (limit && buf->f_blocks > limit) {
-		curblock = dquot->dq_dqb.dqb_curspace >> sb->s_blocksize_bits;
+		curblock = (dquot->dq_dqb.dqb_curspace +
+			    dquot->dq_dqb.dqb_rsvspace) >> sb->s_blocksize_bits;
 		buf->f_blocks = limit;
 		buf->f_bfree = buf->f_bavail =
 			(buf->f_blocks > curblock) ?