git: 9db5ae255127 - stable/14 - ufs quotas: fix configuring soft quota grace time
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sat, 28 Oct 2023 04:45:56 UTC
The branch stable/14 has been updated by kib:
URL: https://cgit.FreeBSD.org/src/commit/?id=9db5ae255127e4b897d777d0a2fe22843644ceba
commit 9db5ae255127e4b897d777d0a2fe22843644ceba
Author: Mikel Lechner <mikel@svpal.org>
AuthorDate: 2023-10-21 06:08:38 +0000
Commit: Konstantin Belousov <kib@FreeBSD.org>
CommitDate: 2023-10-28 04:45:34 +0000
ufs quotas: fix configuring soft quota grace time
MFC after: 1 week
(cherry picked from commit 2fee3974603bce6f2dc153eb6af459cb4f864ab4)
---
sys/ufs/ufs/ufs_quota.c | 16 +++++++++-------
1 file changed, 9 insertions(+), 7 deletions(-)
diff --git a/sys/ufs/ufs/ufs_quota.c b/sys/ufs/ufs/ufs_quota.c
index 8f77fb3a95d2..78f539bcabd2 100644
--- a/sys/ufs/ufs/ufs_quota.c
+++ b/sys/ufs/ufs/ufs_quota.c
@@ -580,6 +580,15 @@ quotaon(struct thread *td, struct mount *mp, int type, void *fname,
VN_LOCK_DSHARE(vp);
VOP_UNLOCK(vp);
*vpp = vp;
+
+ /*
+ * Allow the getdq from getinoquota below to read the quota
+ * from file.
+ */
+ UFS_LOCK(ump);
+ ump->um_qflags[type] &= ~QTF_CLOSING;
+ UFS_UNLOCK(ump);
+
/*
* Save the credential of the process that turned on quotas.
* Set up the time limits for this quota.
@@ -594,13 +603,6 @@ quotaon(struct thread *td, struct mount *mp, int type, void *fname,
ump->um_itime[type] = dq->dq_itime;
dqrele(NULLVP, dq);
}
- /*
- * Allow the getdq from getinoquota below to read the quota
- * from file.
- */
- UFS_LOCK(ump);
- ump->um_qflags[type] &= ~QTF_CLOSING;
- UFS_UNLOCK(ump);
/*
* Search vnodes associated with this mount point,
* adding references to quota file being opened.