xfs: don't set quota warning values

catherinehoang · dchinner · commit 5349b2afc117 · 2022-05-11T17:12:09.000+10:00
Having just dropped support for quota warning limits and warning
counters, the warning fields no longer have any meaning. Prevent these
fields from being set by removing QC_WARNS_MASK from XFS_QC_SETINFO_MASK
and XFS_QC_MASK.

Signed-off-by: Catherine Hoang &lt;catherine.hoang@oracle.com&gt;
Reviewed-by: Darrick J. Wong &lt;djwong@kernel.org&gt;
Signed-off-by: Dave Chinner &lt;david@fromorbit.com&gt;
diff --git a/fs/xfs/xfs_qm_syscalls.c b/fs/xfs/xfs_qm_syscalls.c
@@ -217,8 +217,7 @@ xfs_qm_scall_quotaon(
 	return 0;
 }
 
-#define XFS_QC_MASK \
-	(QC_LIMIT_MASK | QC_TIMER_MASK | QC_WARNS_MASK)
+#define XFS_QC_MASK (QC_LIMIT_MASK | QC_TIMER_MASK)
 
 /*
  * Adjust limits of this quota, and the defaults if passed in.  Returns true
diff --git a/fs/xfs/xfs_quotaops.c b/fs/xfs/xfs_quotaops.c
@@ -98,7 +98,7 @@ xfs_quota_type(int type)
 	}
 }
 
-#define XFS_QC_SETINFO_MASK (QC_TIMER_MASK | QC_WARNS_MASK)
+#define XFS_QC_SETINFO_MASK (QC_TIMER_MASK)
 
 /*
  * Adjust quota timers & warnings

Original file line number	Diff line number	Diff line change
`@@ -217,8 +217,7 @@ xfs_qm_scall_quotaon(`
`217`	`217`	`return 0;`
`218`	`218`	`}`
`219`	`219`
`220`		`-#define XFS_QC_MASK \`
`221`		`- (QC_LIMIT_MASK \| QC_TIMER_MASK \| QC_WARNS_MASK)`
	`220`	`+#define XFS_QC_MASK (QC_LIMIT_MASK \| QC_TIMER_MASK)`
`222`	`221`
`223`	`222`	`/*`
`224`	`223`	`* Adjust limits of this quota, and the defaults if passed in. Returns true`
Original file line number	Diff line number	Diff line change
`@@ -98,7 +98,7 @@ xfs_quota_type(int type)`
`98`	`98`	`}`
`99`	`99`	`}`
`100`	`100`
`101`		`-#define XFS_QC_SETINFO_MASK (QC_TIMER_MASK \| QC_WARNS_MASK)`
	`101`	`+#define XFS_QC_SETINFO_MASK (QC_TIMER_MASK)`
`102`	`102`
`103`	`103`	`/*`
`104`	`104`	`* Adjust quota timers & warnings`