From nobody Sat Oct 28 04:45:19 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SHRmH4Mnwz4yNyc; Sat, 28 Oct 2023 04:45:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SHRmH3mSMz3Rbx; Sat, 28 Oct 2023 04:45:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698468319; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qlgd9jVxf0PRa5f6oX8g35k8i74Ku/ZxYCT+EOUltUA=; b=skn1Ubn4tB68oU0n+ozRBJEWC/mKCUt0lZdRM/t2XqczfhSKVs/riz0RiKEN04uKFakndl C6USmiOHquk/XDSnModAAQLKrGqMjIEtG4Myq5c6ZAc0DOaiu3xVxKbX41gwzYcfMPW5ZK ft+aZTscK/NZ8tuIHjJydpNFdgoG9B0WX4MiFhYWhbRVgae84F8A+uKoymuwokGP2wCbOK vQsvP+ND/lA7Mv+CcE1X3ufVc7jeSuO70qxDjcqSeU6utenmvrTxMlz5DEk+Q8B1yrcVuV dCjGKgadqX1ghHZAaLDctm2YmhcSba9FIk1RCqrVyF0VQ/DE7qDACTIqsYYjxQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698468319; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qlgd9jVxf0PRa5f6oX8g35k8i74Ku/ZxYCT+EOUltUA=; b=L44nsP3Z3qfL+KoO/7jZ1O17SkD7vMN0gVQq6ohIK9cnOHt0u4+IzxBxHsK8E9e7UMQ/JR Ohuv+nbVnwXtPzg5HE7DB4DNnfvyIML1/NrfzrkL5o+HLRCzjbtnWisNAkG1GyTcqQOnMy a/eTTREtoR0zp7o20dgeYSsT1+fC/veFgPfsGxT1IuYrR5sJpVuS0TAQBmSUymL1Iya0YF Yr5Zfh2gaBVXS72JF56SuYGk/Kir8LogLNTHyB8LRgThN4UTw2K7U9kZ4FFHjDnuhTE4pp C8UbDRCSpX6qVN/sYEO0AnbTZDqQs+igrqiXJS/jKbVJ+YZXpGdYYPiMe8mJiA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698468319; a=rsa-sha256; cv=none; b=aRTU71n4L2fY5tihUDcOKZ5Ttp58QbjoPXUQLEUPFXGJsWk/sf2YPtBLe2yLRbP8R/ALWe TrZ0oJOm2ibfQxPf8PcQ8H8OogFVBoawfvE//bDg5fsODKWW5ZXfCFGQ13RN50IPAVtxcY nhkJllekncWia7FI2ZrV6d75q9BQMKf04DHP1embTDIcQNAJibCukXUjjm/G7meGDD1tFI iG/oKAclr2hYraFbCeAZBKoRNt++CAN42puCwnZrqIwpeOJHShN7V7O+9FC1qKJXDedpfZ 3ebAuu16bEY5rmQQf3ONuvenq/P0M///4HZeaOUHguCHNTEPX57UV0HLiwG4Aw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SHRmH2qmTzjZj; Sat, 28 Oct 2023 04:45:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39S4jJ0U012005; Sat, 28 Oct 2023 04:45:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39S4jJGi012002; Sat, 28 Oct 2023 04:45:19 GMT (envelope-from git) Date: Sat, 28 Oct 2023 04:45:19 GMT Message-Id: <202310280445.39S4jJGi012002@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 6ce903e8a8a7 - stable/13 - ufs quotas: fix configuring soft quota grace time List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 6ce903e8a8a78cea2b8ff269c5accbf5529e3045 Auto-Submitted: auto-generated The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=6ce903e8a8a78cea2b8ff269c5accbf5529e3045 commit 6ce903e8a8a78cea2b8ff269c5accbf5529e3045 Author: Mikel Lechner AuthorDate: 2023-10-21 06:08:38 +0000 Commit: Konstantin Belousov CommitDate: 2023-10-28 04:44:44 +0000 ufs quotas: fix configuring soft quota grace time PR: 274552 (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 0119c5ba9eeb..8b53c4d2e61f 100644 --- a/sys/ufs/ufs/ufs_quota.c +++ b/sys/ufs/ufs/ufs_quota.c @@ -584,6 +584,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. @@ -598,13 +607,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.