aboutsummaryrefslogtreecommitdiff
path: root/fs/ext4
diff options
context:
space:
mode:
authorGravatar Konstantin Khlebnikov <khlebnikov@yandex-team.ru> 2018-05-20 22:49:54 -0400
committerGravatar Theodore Ts'o <tytso@mit.edu> 2018-05-20 22:49:54 -0400
commitf06925c7394236d769c788940c9a7b85dbe4c40c (patch)
tree879115a132b59b462c16072008c2cc28f676a650 /fs/ext4
parentext4: remove NULL check before calling kmem_cache_destroy() (diff)
downloadlinux-f06925c7394236d769c788940c9a7b85dbe4c40c.tar.gz
linux-f06925c7394236d769c788940c9a7b85dbe4c40c.tar.bz2
linux-f06925c7394236d769c788940c9a7b85dbe4c40c.zip
ext4: report delalloc reserve as non-free in statfs for project quota
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> Signed-off-by: Theodore Ts'o <tytso@mit.edu> Reviewed-by: Jan Kara <jack@suse.cz> Fixes: 689c958cbe6b ("ext4: add project quota support")
Diffstat (limited to 'fs/ext4')
-rw-r--r--fs/ext4/super.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/ext4/super.c b/fs/ext4/super.c
index 1388e56bb3f5..c1c5c8775ae7 100644
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
@@ -5289,7 +5289,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) ?