summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCatherine Hoang <catherine.hoang@oracle.com>2022-05-10 13:28:00 -0700
committerDave Chinner <david@fromorbit.com>2022-05-11 17:12:09 +1000
commit5349b2afc117d87d35502f2fe1930692d6bfc68b (patch)
tree5b7d42cba9bdd840a033f59a90f17a780cf7fe21
parent2e06df552a7cba13eb0046b9116a9aa26001ee2c (diff)
downloadlinux-5349b2afc117d87d35502f2fe1930692d6bfc68b.tar.gz
linux-5349b2afc117d87d35502f2fe1930692d6bfc68b.tar.bz2
linux-5349b2afc117d87d35502f2fe1930692d6bfc68b.zip
xfs: don't set quota warning values
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 <catherine.hoang@oracle.com> Reviewed-by: Darrick J. Wong <djwong@kernel.org> Signed-off-by: Dave Chinner <david@fromorbit.com>
-rw-r--r--fs/xfs/xfs_qm_syscalls.c3
-rw-r--r--fs/xfs/xfs_quotaops.c2
2 files changed, 2 insertions, 3 deletions
diff --git a/fs/xfs/xfs_qm_syscalls.c b/fs/xfs/xfs_qm_syscalls.c
index 2149c203b1d0..74ac9ca9e119 100644
--- 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
index 50391730241f..9c162e69976b 100644
--- 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