From nobody Mon Feb 13 23:16:45 2023 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 4PG0bL27cWz3qc0s; Mon, 13 Feb 2023 23:16:46 +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 4PG0bL1dNhz3NfF; Mon, 13 Feb 2023 23:16:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676330206; 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=djBRDtvGi3aFzzIVqrA4pb3qh7862twW+41qc9KrDms=; b=STwJAFO9vRTlfmNLwJZYjYJimpnuGWptP8NbKfK8v5G8jPq7gWOXcfdgwOSpPxoKhbBYO5 l0WR7qRj5qUXHe4SqvjzSrwnP+GVpMIOb6zmPMI0PZYzT3BytUzE1TB6X0/6FgoxQIoJ/m VCT0grSQ6Lzc2sjj8p9kCK4EoUD+1GlST+U5hYxB/RByJuyYB1QJIQX7PsaqhJgNs5iQU0 /DjiVS6Ag0hS9/Z451A8C4ZVq770dgViF4RwXzZSiPHXuNgo/9+G1pj2A8SO1T/ceexBTu QB8qrPg6UvoN4QZkG3eoCjT5qDw/Dlpu2KDHhxoY1kCZEEFyWqAj2O0DkrcwnA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676330206; 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=djBRDtvGi3aFzzIVqrA4pb3qh7862twW+41qc9KrDms=; b=sgtNYqfMlQnhLnfVzY6Q/u2GLeJ9M+bp3T8h6JmAXMV15F0LMB55jEXtZvqttmNSa1aE99 wfZy5MJH0YkcgLYp1KAZgTem0ztVP9a/zqZOOjrQW+XZ4HJG0NEK43QkoBTbIeTiQGjR4D yk+TatUUrKugT3R0lxd0h+xOWC3hGCe1t0FwqslqC8EcXVafwTSk31X4rs4cF95lKFAuzo ddhr0mqKqa934E/CXm3lMsIARHa+Fd766VINqM5cQ2g5D0lDUa0KNc2r2aRF+WVc1jRlhu KzuipqUOmn781Fw6ui6uVhou0lOn/RiuVWgYjDnoW8rWvV8LdBL0Scn26PGwTQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1676330206; a=rsa-sha256; cv=none; b=IS+zajM0QU1TcH90s8VPHo/JDDRSK1Fbf05NK24DKFSCYTmuL8uGBl8RjMra6IVvM+PH7u GIY+JrBkWfTuMfVWzfIP7Vi5QZQHUNAloazv9KVaqJfH33AIpkrovxK5fZUwnA2pDptr6Q JLOVPg/hu+7dP0TH+V26eFyMkiVg8tgElIYgeINagq0vmekFi/TSFgQawIbpQZClTqzUAc PLZIQILjV2D6h5GPJRQ5pWjU915nLAmDedWC0AZuL31siUXmu3dCbFycUq1tvXg2AkUHDh SwVbXt/qkjhpQr84qZ3npz1+RdsuI55SepbXYpl+Lq6M7F/oB4adQ+bki8XDWA== 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 4PG0bL0h1CzcZ5; Mon, 13 Feb 2023 23:16:46 +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 31DNGjWv044321; Mon, 13 Feb 2023 23:16:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31DNGjis044320; Mon, 13 Feb 2023 23:16:45 GMT (envelope-from git) Date: Mon, 13 Feb 2023 23:16:45 GMT Message-Id: <202302132316.31DNGjis044320@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 889f07460151 - main - tmpfs_access(): style fixes and remove redundand assertions 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 889f07460151ad20d3171cb37c608aaee112e408 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=889f07460151ad20d3171cb37c608aaee112e408 commit 889f07460151ad20d3171cb37c608aaee112e408 Author: Konstantin Belousov AuthorDate: 2023-02-12 22:15:00 +0000 Commit: Konstantin Belousov CommitDate: 2023-02-13 23:16:38 +0000 tmpfs_access(): style fixes and remove redundand assertions Note that MPASS(VOP_ISLOCKED(vp)) is simply broken. Reviewed by: markj, mjg Tested by: pho Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D38557 --- sys/fs/tmpfs/tmpfs_vnops.c | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/sys/fs/tmpfs/tmpfs_vnops.c b/sys/fs/tmpfs/tmpfs_vnops.c index 28de8c989487..c7371de28896 100644 --- a/sys/fs/tmpfs/tmpfs_vnops.c +++ b/sys/fs/tmpfs/tmpfs_vnops.c @@ -379,20 +379,17 @@ int tmpfs_access(struct vop_access_args *v) { struct vnode *vp = v->a_vp; - accmode_t accmode = v->a_accmode; struct ucred *cred = v->a_cred; + struct tmpfs_node *node = VP_TO_TMPFS_NODE(vp); mode_t all_x = S_IXUSR | S_IXGRP | S_IXOTH; + accmode_t accmode = v->a_accmode; int error; - struct tmpfs_node *node; - - MPASS(VOP_ISLOCKED(vp)); - - node = VP_TO_TMPFS_NODE(vp); /* * Common case path lookup. */ - if (__predict_true(accmode == VEXEC && (node->tn_mode & all_x) == all_x)) + if (__predict_true(accmode == VEXEC && + (node->tn_mode & all_x) == all_x)) return (0); switch (vp->v_type) { @@ -401,7 +398,8 @@ tmpfs_access(struct vop_access_args *v) case VLNK: /* FALLTHROUGH */ case VREG: - if (accmode & VWRITE && vp->v_mount->mnt_flag & MNT_RDONLY) { + if ((accmode & VWRITE) != 0 && + (vp->v_mount->mnt_flag & MNT_RDONLY) != 0) { error = EROFS; goto out; } @@ -421,7 +419,7 @@ tmpfs_access(struct vop_access_args *v) goto out; } - if (accmode & VWRITE && node->tn_flags & IMMUTABLE) { + if ((accmode & VWRITE) != 0 && (node->tn_flags & IMMUTABLE) != 0) { error = EPERM; goto out; } @@ -430,8 +428,6 @@ tmpfs_access(struct vop_access_args *v) accmode, cred); out: - MPASS(VOP_ISLOCKED(vp)); - return (error); } @@ -1157,7 +1153,7 @@ tmpfs_rename(struct vop_rename_args *v) TMPFS_UNLOCK(tmp); error = EINVAL; if (newname != NULL) - free(newname, M_TMPFSNAME); + free(newname, M_TMPFSNAME); goto out_locked; } parent = n->tn_dir.tn_parent;