git: 889f07460151 - main - tmpfs_access(): style fixes and remove redundand assertions

[Konstantin Belousov]

The branch main has been updated by kib:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=889f07460151ad20d3171cb37c608aaee112e408

commit 889f07460151ad20d3171cb37c608aaee112e408
Author:     Konstantin Belousov <k...@freebsd.org>
AuthorDate: 2023-02-12 22:15:00 +0000
Commit:     Konstantin Belousov <k...@freebsd.org>
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;