From nobody Sat Oct 28 04:45:56 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 4SHRn033l9z4yP1x; Sat, 28 Oct 2023 04:45:56 +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 4SHRn02Qtgz3Rty; Sat, 28 Oct 2023 04:45:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698468356; 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=/3fKB8U8bIfY53ikB7lES7KSRM8NW75H38pqj1Ikz70=; b=mtrxBMbMzCWabt5SLu7ofLrqSMtTBAurnj8yCRy1jXzKdMDFEtGjVly43F/6Kdboz6q/dd Ql6L0YdyBhEZY5+RcrdoXo3ErGSX346R+yG5NoNGfisaXLszrZvSvgxc9/vsWfa4vDuCmF DIbgEHWCsZ4EYKDVeGggUxgElfUG1s6zmT0D9QQhTUhh4fe6u1KnmDsKWgjY6oF2odUNLh PNJwd5Plqw1XFDkz58WWRlBtJbicUvmzwGk3e+7FRWBeMt+zMV9h4KqEf+tC/Bk+trzPTE o+uS3c6PobEIkiWOg/V1iT1wuV/JFPD/dvtum3NeE6nGDNK4L0pUJyYRsPHdOg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698468356; 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=/3fKB8U8bIfY53ikB7lES7KSRM8NW75H38pqj1Ikz70=; b=jMH8lE7IQwINqaHLCOWjw0w/GdENya7vnsfaSPOlS4SxSZwXgPhKM0fu775stfTxU2uxsJ foQ+lomFrHahC1jyPa07ZLf9F3eAI/yWG8h0+AtlWWb/k9lFudcEjA1BtjRysH1GN6yDHF TBYwTWKxUR6afNJiQaeMn/H/TTb32+pAWEFr1xBV8GuD4vwU1npbzn/HFITdirsy+rYpRe p46M0o+p2TK7QIPJXYlt1pJPkjJwln4OkepORmmjHs38x52fkEeNsWyxJgAIE1bh+FzWil mmKSl3bCoh3fOPPCFoZSRN4UujDR/Vep/DWXDOcHdWSsUDzz3akaiCDDYAldEg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698468356; a=rsa-sha256; cv=none; b=EyvF0MlhlR2PNFJ8DXlWvoMh7xilTiXAwvytHIr8wA9c0acsEgahuaplYUWtkQHDDriNLo gXfpwpf/V5p1wENNwhIngeJgf6o4FBy/rrkTatrxkrjFCiupqAulgFf30WwatPRZttK8AD T3z5XYi0EHafE/hzzhDMDk4jS74Vi7OxCl29GNkV3lN7GZA8POvKGlngByaPE4I4H96xZ3 oFxnOLGlOLKtuwIzykTeGHb9xLkNcy07qFnYdCa60fmYowXuimfUUN0iufnAAGAs68CWEa k9+MDbI76VrqcPxmd7m7MS7LOo9Thn0teWt3uuz1nrxs1qS3apt6f6TsMxImlA== 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 4SHRn01TZqzjJg; Sat, 28 Oct 2023 04:45:56 +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 39S4juL9012239; Sat, 28 Oct 2023 04:45:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39S4juG2012236; Sat, 28 Oct 2023 04:45:56 GMT (envelope-from git) Date: Sat, 28 Oct 2023 04:45:56 GMT Message-Id: <202310280445.39S4juG2012236@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: 9db5ae255127 - stable/14 - 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/14 X-Git-Reftype: branch X-Git-Commit: 9db5ae255127e4b897d777d0a2fe22843644ceba Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=9db5ae255127e4b897d777d0a2fe22843644ceba commit 9db5ae255127e4b897d777d0a2fe22843644ceba Author: Mikel Lechner AuthorDate: 2023-10-21 06:08:38 +0000 Commit: Konstantin Belousov 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.