From nobody Mon Nov 07 23:37:35 2022 X-Original-To: dev-commits-src-main@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 4N5nhc25Xkz4gjlM; Mon, 7 Nov 2022 23:37:36 +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 4N5nhc0NqMz5SVM; Mon, 7 Nov 2022 23:37:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667864256; 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=bXLDvc96xDv2TVZPX5TwownL2k08YA+DUmpndPIPLHU=; b=GviAm2gt/WCKtmCeYOFpMm2eF/I5j2kdvg7us9Im/vwyYEFWC+DH272F0b6RBwh+vXnPQE XAAXWBsqDWFotSwHZ4JZipRSOSknkZRxf+d6ehc4I4GamqWE0HYeB5c079H1Ba4abaR9tU hrT8fKhb5WHppw7BksJhiOcaYJrQn/sAlmM231GbGZ1VL5DrQUSVO85LEsExLA6TSX5zQO Bu+hAXQZ3FVM3eSx9F3E83qfVftqUIt8QXI9vnVR+lGfo/VqBVylDmlsjpWQw6LhHtTIWq 4WTffx+ZSUD/7Cjtah9o/8oDeYepNibSPQWLkjkCFQjOObHUpYxRH8l53MjoiQ== 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 4N5nhb6SZQzKj0; Mon, 7 Nov 2022 23:37:35 +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 2A7NbZSg038151; Mon, 7 Nov 2022 23:37:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2A7NbZ0H038150; Mon, 7 Nov 2022 23:37:35 GMT (envelope-from git) Date: Mon, 7 Nov 2022 23:37:35 GMT Message-Id: <202211072337.2A7NbZ0H038150@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: b935e867af18 - main - Tree-wide replacement of VOP_UNLOCK + vrele combo with vput List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: b935e867af1855d008de127151d69a1061541ba5 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667864256; 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=bXLDvc96xDv2TVZPX5TwownL2k08YA+DUmpndPIPLHU=; b=mHwr514dMq7w+UPIB88k84/MK0DbTBOfa1vwNFGDjOk6TMiRjpmlZcl2S+ZacpWCt1PqAc toYOUe6UdytvoKJZYDbow1f0tLJwJDe17v8UUwSZWDNNhJK7ksxGnaymV7IO6ZAPXkrAFR GkSr0P35Y52dJZqK4QYW0pOVpbR4QkfSzDY3wMT8Qfequqrbn4AU1A+M1cpeEUEZkJoR78 atJLrdIbaVKg7AHFJRRea4IJTbhonbJOOr46uUWzJiwwtHLuEhEWSq6YXCbqcp4/afXBkA Nv2h7xjQI0dTxCzfbC3Jglsel/LWRyohQpUtmpsqF0d+ZwW3e2U1SrQAYR/V8A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1667864256; a=rsa-sha256; cv=none; b=c6YW90XfSTQzbtdTt0nbq5190rj2hrbzEXl5brqRq2oSdciiuSlzdYPV81kPIZHYh5MshC BgiRAL1urU7CxPdwXQH+xyoKT/WazWKF012O8XPPwLKXM9l3CTJxeUEieSxEfBNimBm6EI ThDkPajPC5SB2D3TvLBW89g0BxwKT20AXTIAQOvv4ZXoQ4Pe7VLRAQljTpFXdsbftPFaPv q0rZUr6zrJrr5nV16Jixz5qzRE1LEKv3OzBiEe5NH/oVnK4R3D3MJdIlpm06Azt4JyjXVd oX4CP1pQS2DTrJeujAnu059TytrrKK7hkG/0pc3EOUBLw3kBtmjjSl5LaKeO3A== 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=b935e867af1855d008de127151d69a1061541ba5 commit b935e867af1855d008de127151d69a1061541ba5 Author: Mateusz Guzik AuthorDate: 2022-11-07 23:33:15 +0000 Commit: Mateusz Guzik CommitDate: 2022-11-07 23:34:27 +0000 Tree-wide replacement of VOP_UNLOCK + vrele combo with vput No functional changes. --- sys/fs/ext2fs/ext2_vfsops.c | 9 +++------ sys/fs/fuse/fuse_vfsops.c | 3 +-- sys/fs/msdosfs/msdosfs_vfsops.c | 3 +-- sys/ufs/ufs/ufs_quota.c | 9 +++------ 4 files changed, 8 insertions(+), 16 deletions(-) diff --git a/sys/fs/ext2fs/ext2_vfsops.c b/sys/fs/ext2fs/ext2_vfsops.c index d66d44c6ba32..408f3dac6833 100644 --- a/sys/fs/ext2fs/ext2_vfsops.c +++ b/sys/fs/ext2fs/ext2_vfsops.c @@ -812,8 +812,7 @@ loop: error = bread(devvp, fsbtodb(fs, ino_to_fsba(fs, ip->i_number)), (int)fs->e2fs_bsize, NOCRED, &bp); if (error) { - VOP_UNLOCK(vp); - vrele(vp); + vput(vp); MNT_VNODE_FOREACH_ALL_ABORT(mp, mvp); return (error); } @@ -822,8 +821,7 @@ loop: EXT2_INODE_SIZE(fs) * ino_to_fsbo(fs, ip->i_number)), ip); brelse(bp); - VOP_UNLOCK(vp); - vrele(vp); + vput(vp); if (error) { MNT_VNODE_FOREACH_ALL_ABORT(mp, mvp); @@ -1167,8 +1165,7 @@ loop: } if ((error = VOP_FSYNC(vp, waitfor, td)) != 0) allerror = error; - VOP_UNLOCK(vp); - vrele(vp); + vput(vp); } /* diff --git a/sys/fs/fuse/fuse_vfsops.c b/sys/fs/fuse/fuse_vfsops.c index fa0766fb0d33..93916b34be83 100644 --- a/sys/fs/fuse/fuse_vfsops.c +++ b/sys/fs/fuse/fuse_vfsops.c @@ -624,8 +624,7 @@ fuse_vfsop_root(struct mount *mp, int lkflags, struct vnode **vpp) SDT_PROBE2(fusefs, , vfsops, trace, 1, "root vnode race"); FUSE_UNLOCK(); - VOP_UNLOCK(*vpp); - vrele(*vpp); + vput(*vpp); vrecycle(*vpp); *vpp = data->vroot; } else diff --git a/sys/fs/msdosfs/msdosfs_vfsops.c b/sys/fs/msdosfs/msdosfs_vfsops.c index cb7153fe1f7f..dfe31ca18b9a 100644 --- a/sys/fs/msdosfs/msdosfs_vfsops.c +++ b/sys/fs/msdosfs/msdosfs_vfsops.c @@ -1041,8 +1041,7 @@ loop: error = VOP_FSYNC(vp, waitfor, td); if (error) allerror = error; - VOP_UNLOCK(vp); - vrele(vp); + vput(vp); } /* diff --git a/sys/ufs/ufs/ufs_quota.c b/sys/ufs/ufs/ufs_quota.c index 010acbe67da7..b279dc8fe221 100644 --- a/sys/ufs/ufs/ufs_quota.c +++ b/sys/ufs/ufs/ufs_quota.c @@ -615,13 +615,11 @@ again: goto again; } if (vp->v_type == VNON || vp->v_writecount <= 0) { - VOP_UNLOCK(vp); - vrele(vp); + vput(vp); continue; } error = getinoquota(VTOI(vp)); - VOP_UNLOCK(vp); - vrele(vp); + vput(vp); if (error) { MNT_VNODE_FOREACH_ALL_ABORT(mp, mvp); break; @@ -684,8 +682,7 @@ again: dq = ip->i_dquot[type]; ip->i_dquot[type] = NODQUOT; dqrele(vp, dq); - VOP_UNLOCK(vp); - vrele(vp); + vput(vp); } error = dqflush(qvp);