From nobody Wed Sep 14 18:12:21 2022 X-Original-To: dev-commits-src-all@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 4MST2F6GkWz4bmC5; Wed, 14 Sep 2022 18:12:21 +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 4MST2F5Wmsz3WQ7; Wed, 14 Sep 2022 18:12:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1663179141; 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=iqOsRVDpbdMtoX/3aOCSXd5XO8+MUSWC2/ifx1dhIkU=; b=agiQealxtwso0uk/TUm9F/Wtwk3LYIVobtaRVSi9tSMHJHwMiWp8Id/gXRng5oMCTcKZXu TnYS7kTVNXGZf/+Zilj4LoUbJv1+mSkhuMPaXbRcq1YPmF6CP0wvHVX1ycstIWwEJZIVNQ IudVGlibW/prqRBq6enFR0pVgmCsVL4ARucavaM/Vus3vtHpHUeuLFnzrdQTNulwBKuaPP fqzJ1vX64rEskQvvAignrYpgJHAFZYZS4JToZCoXwgv1+g+yE/w78DLNFM62rqkaw7goD7 Z1AR2MbU9BT3DhiNDJ6AU4lYvoie0R9Y7/vZ4rGXNF/5Rny3PiFqci/sjV2z0A== 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 4MST2F4ZtrzlYV; Wed, 14 Sep 2022 18:12:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 28EICLGr084366; Wed, 14 Sep 2022 18:12:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 28EICLvW084365; Wed, 14 Sep 2022 18:12:21 GMT (envelope-from git) Date: Wed, 14 Sep 2022 18:12:21 GMT Message-Id: <202209141812.28EICLvW084365@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mateusz Guzik Subject: git: be931de6c99f - main - ufs: always call ufs_itimes on close List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mjg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: be931de6c99f346cedb7a364602f1cb654a32caf Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1663179141; 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=iqOsRVDpbdMtoX/3aOCSXd5XO8+MUSWC2/ifx1dhIkU=; b=CeD0Qc3uD8JkmIeSaSUwKblFpETlXndYJrrTZnHW7I53wbWBDzeZ400RE3ZYDz4qu9r9Uy P5Akjz34fKOXaDb6xUokdTE7MgjQ2X6cMaOEGk5eNwBntyRTyxwbMveIuY2U+9EZ1lZ/9K 5nL+/KoB95WvlXFHc+L6Hkff66mCrIzxSJb6fDXj24zIttbwHebKxhwbrn4kbTNYnlUZ3J zbCWYmFpLrYcu4JZfPzyQgDw3mHJQDnbl7lNQnW6ty+POybzfSH7MuG6ET5yAoFPTNOMbu es1F38TH+sT4uT0KK7mFkZaduvleEKZMStHEZ9NdDHKa6DXBWyKGurIhV1qW/Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1663179141; a=rsa-sha256; cv=none; b=fLcf5bM2h6ZGKqdSM275NQPwym2vLRD0bgvW2oC0Cy/38c4Rpn4ArXZa3tx6XrbmknzxPl rt9PBIZ4j1ajaS7KD5ldPZO525p7TSPEdy3v5aVMa0tRPMOePcnv4mKFZueZJ/ZBoU/CXl OXyfSm2RYCRX0uf7mKH9JsVu3b5tQloynEL3wnPO3eECyedt9TmwTS7yMUx1kHoOPJFdi5 jFb2UrlnYbvluY0zHkKVja1ujEFze0nRfelRq+xQ6kPQGAVhRGItJ6CiTpMQpGarYMFeR0 irc9o983TP8lFapsjs2gseJy6LX8sQZktiiPL8f9yMjzwp3U4IC88OQblMwwuw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mjg: URL: https://cgit.FreeBSD.org/src/commit/?id=be931de6c99f346cedb7a364602f1cb654a32caf commit be931de6c99f346cedb7a364602f1cb654a32caf Author: Mateusz Guzik AuthorDate: 2022-09-12 23:19:42 +0000 Commit: Mateusz Guzik CommitDate: 2022-09-14 18:11:40 +0000 ufs: always call ufs_itimes on close While here dedup code with fifo. Reviewed by: kib, mckusick Differential Revision: https://reviews.freebsd.org/D36522 --- sys/ufs/ufs/ufs_vnops.c | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/sys/ufs/ufs/ufs_vnops.c b/sys/ufs/ufs/ufs_vnops.c index 0c4f2f9941b1..9f1fe0409483 100644 --- a/sys/ufs/ufs/ufs_vnops.c +++ b/sys/ufs/ufs/ufs_vnops.c @@ -354,13 +354,8 @@ ufs_close( } */ *ap) { struct vnode *vp = ap->a_vp; - int usecount; - VI_LOCK(vp); - usecount = vp->v_usecount; - if (usecount > 1) - ufs_itimes_locked(vp); - VI_UNLOCK(vp); + ufs_itimes(vp); return (0); } @@ -2640,14 +2635,8 @@ ufsfifo_close( struct thread *a_td; } */ *ap) { - struct vnode *vp = ap->a_vp; - int usecount; - VI_LOCK(vp); - usecount = vp->v_usecount; - if (usecount > 1) - ufs_itimes_locked(vp); - VI_UNLOCK(vp); + ufs_close(ap); return (fifo_specops.vop_close(ap)); }