From nobody Sun Feb 19 05:47:20 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 4PKF1j0qntz3smHr; Sun, 19 Feb 2023 05:47: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 4PKF1h684sz3LDf; Sun, 19 Feb 2023 05:47:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676785640; 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=5R+H/pgBaZd/+gqAbOeVOq3IBKBm0Rafcyc01ArrCj8=; b=vBq3XvLn3i8nFFuwNlZ45HyvDNkloRPmK7Yshj3G/smUBP7EWdCLOvriuttSVs0aQ+3xwh pct1la34bXlHy1rxSLMdRfDJmogZ9db0f14+7fewYoRr/O6SeKAybxh9LM27gic4Vy7od5 vPk19hWPNkhwSkKp5767JXSJTAW2akrPCv05IzzDlnXRV0dbeD0b25aETtz8DjU/xvxl2e B4yWXRqKwE113zUHCKT3ebsz6+GxrGvszHP4h1e7EZ7Uc2a/+8y1qmS2Bmvj617CHRsp19 0Suje+VyW4+U+iKCv6sRilsdQnNQ59QL54Rd+8wGrm6h4cNejSvkN40uEeQHwg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676785640; 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=5R+H/pgBaZd/+gqAbOeVOq3IBKBm0Rafcyc01ArrCj8=; b=nxNDaNmxynokm39ty941PaYUA5iSo4HTix4d1XOlrdrI3bFU/mv6PlawwzM/NdfSOUZ8sv AC2RKw9QKnWec01cZMHLxzP8zHzTQS0ISZOJGXwnpc9RDeKvbXK6+pJNjhp2iLY/KXlzXU NNjkKpgC/whhytXKgmBMdNL2oSGU6aTN45cPLmJ2jivkR2KUMhsh8oo906r+DLPEVKKNpx 1WBMoVs8TWZCmjm7gBI6nY0fzdVO6BPKz62HzXa4+SH5Fhpdqdx/IoRK2F5Qifv8Y7Akqy HHKpG89TyXTpZpRviQLRp+h6TI0LL4+7z3NTtEYSVTA2gs/vZHTVN475mQlp4g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1676785640; a=rsa-sha256; cv=none; b=clxvwuMLKQEtYfmqin/GyBDY0M8xCxxrtF/LbAvmgLT/UP0wEdQtaSODvaQxrA7UW6q5D2 b9tOcr9/PcPVR8XLZFgBD+xTl/ndFeYLY7czdmADs7o64Yh1noAjzxuNKHFlxcDttsS505 155WbjakaMV0m2pX7L2J2Cnz41m+OGVAbOn9Ovzow15BhSXGWbe37c9imwiQnaO7yLLbe7 ZEvse2ayUWS85Mp20nqHodXmooJA6w0UMu9oBtwlCCI00DLksILJolDc7Q6Zl8zaO1Jd1i pRziRpKvv/G2cAx1z25/laaFXf00iFQ2MJxk4oLAzJmnwTBx/2P4dvEWcM+6+Q== 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 4PKF1h585TzqsV; Sun, 19 Feb 2023 05:47:20 +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 31J5lKGr097228; Sun, 19 Feb 2023 05:47:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31J5lKM8097227; Sun, 19 Feb 2023 05:47:20 GMT (envelope-from git) Date: Sun, 19 Feb 2023 05:47:20 GMT Message-Id: <202302190547.31J5lKM8097227@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: d152426ddf35 - stable/13 - tmpfs: remove bogus MPASS(VOP_ISLOCKED(vp)) asserts 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: d152426ddf35cf7fd69e95c024f6a00c582ef809 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=d152426ddf35cf7fd69e95c024f6a00c582ef809 commit d152426ddf35cf7fd69e95c024f6a00c582ef809 Author: Konstantin Belousov AuthorDate: 2023-02-13 23:23:24 +0000 Commit: Konstantin Belousov CommitDate: 2023-02-19 05:16:25 +0000 tmpfs: remove bogus MPASS(VOP_ISLOCKED(vp)) asserts (cherry picked from commit 9ff2fbdf2ded59e276fdbf7ef7d18c726386b6fb) --- sys/fs/tmpfs/tmpfs_subr.c | 3 ++- sys/fs/tmpfs/tmpfs_vnops.c | 23 ++++++++--------------- 2 files changed, 10 insertions(+), 16 deletions(-) diff --git a/sys/fs/tmpfs/tmpfs_subr.c b/sys/fs/tmpfs/tmpfs_subr.c index 1c0b4406e460..351530a56698 100644 --- a/sys/fs/tmpfs/tmpfs_subr.c +++ b/sys/fs/tmpfs/tmpfs_subr.c @@ -1108,7 +1108,8 @@ out: *vpp = vp; #ifdef INVARIANTS - MPASS(*vpp != NULL && VOP_ISLOCKED(*vpp)); + MPASS(*vpp != NULL); + ASSERT_VOP_LOCKED(*vpp, __func__); TMPFS_NODE_LOCK(node); MPASS(*vpp == node->tn_vnode); TMPFS_NODE_UNLOCK(node); diff --git a/sys/fs/tmpfs/tmpfs_vnops.c b/sys/fs/tmpfs/tmpfs_vnops.c index 0074e3203bbb..aa4089b7c50d 100644 --- a/sys/fs/tmpfs/tmpfs_vnops.c +++ b/sys/fs/tmpfs/tmpfs_vnops.c @@ -222,11 +222,18 @@ tmpfs_lookup1(struct vnode *dvp, struct vnode **vpp, struct componentname *cnp) cache_enter(dvp, *vpp, cnp); out: +#ifdef INVARIANTS /* * If there were no errors, *vpp cannot be null and it must be * locked. */ - MPASS(IFF(error == 0, *vpp != NULLVP && VOP_ISLOCKED(*vpp))); + if (error == 0) { + MPASS(*vpp != NULLVP); + ASSERT_VOP_LOCKED(*vpp, __func__); + } else { + MPASS(*vpp == NULL); + } +#endif return (error); } @@ -549,7 +556,6 @@ tmpfs_setattr(struct vop_setattr_args *v) int error; - MPASS(VOP_ISLOCKED(vp)); ASSERT_VOP_IN_SEQC(vp); error = 0; @@ -592,8 +598,6 @@ tmpfs_setattr(struct vop_setattr_args *v) */ tmpfs_update(vp); - MPASS(VOP_ISLOCKED(vp)); - return (error); } @@ -723,8 +727,6 @@ tmpfs_fsync(struct vop_fsync_args *v) { struct vnode *vp = v->a_vp; - MPASS(VOP_ISLOCKED(vp)); - tmpfs_check_mtime(vp); tmpfs_update(vp); @@ -743,9 +745,6 @@ tmpfs_remove(struct vop_remove_args *v) struct tmpfs_node *dnode; struct tmpfs_node *node; - MPASS(VOP_ISLOCKED(dvp)); - MPASS(VOP_ISLOCKED(vp)); - if (vp->v_type == VDIR) { error = EISDIR; goto out; @@ -794,7 +793,6 @@ tmpfs_link(struct vop_link_args *v) struct tmpfs_dirent *de; struct tmpfs_node *node; - MPASS(VOP_ISLOCKED(dvp)); MPASS(cnp->cn_flags & HASBUF); MPASS(dvp != vp); /* XXX When can this be false? */ node = VP_TO_TMPFS_NODE(vp); @@ -986,8 +984,6 @@ tmpfs_rename(struct vop_rename_args *v) int error; bool want_seqc_end; - MPASS(VOP_ISLOCKED(tdvp)); - MPASS(IMPLIES(tvp != NULL, VOP_ISLOCKED(tvp))); MPASS(fcnp->cn_flags & HASBUF); MPASS(tcnp->cn_flags & HASBUF); @@ -1302,9 +1298,6 @@ tmpfs_rmdir(struct vop_rmdir_args *v) struct tmpfs_node *dnode; struct tmpfs_node *node; - MPASS(VOP_ISLOCKED(dvp)); - MPASS(VOP_ISLOCKED(vp)); - tmp = VFS_TO_TMPFS(dvp->v_mount); dnode = VP_TO_TMPFS_DIR(dvp); node = VP_TO_TMPFS_DIR(vp);