From: Jan Kara <jack@suse.cz>
Date: Mon, 12 Jul 2021 15:43:08 +0000 (+0200)
Subject: quota: Do not account space used by project quota file to quota
X-Git-Tag: v1.46.4~43
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dfe01a11a499b2a87d7d64df46e4feaf86f7dcb0;p=thirdparty%2Fe2fsprogs.git

quota: Do not account space used by project quota file to quota

Project quota files have high inode numbers but are not accounted in
quota usage. Do not track them when computing quota usage.

Signed-off-by: Jan Kara <jack@suse.cz>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
---

diff --git a/lib/support/mkquota.c b/lib/support/mkquota.c
index 71f42c2cb..dce077e64 100644
--- a/lib/support/mkquota.c
+++ b/lib/support/mkquota.c
@@ -501,9 +501,11 @@ errcode_t quota_compute_usage(quota_ctx_t qctx)
 		}
 		if (ino == 0)
 			break;
-		if (inode->i_links_count &&
-		    (ino == EXT2_ROOT_INO ||
-		     ino >= EXT2_FIRST_INODE(fs->super))) {
+		if (!inode->i_links_count)
+			continue;
+		if (ino == EXT2_ROOT_INO ||
+		    (ino >= EXT2_FIRST_INODE(fs->super) &&
+		     ino != quota_type2inum(PRJQUOTA, fs->super))) {
 			space = ext2fs_get_stat_i_blocks(fs,
 						EXT2_INODE(inode)) << 9;
 			quota_data_add(qctx, inode, ino, space);