From nobody Wed May 29 05:36:26 2024 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 4VpymV3rgkz5LnD6; Wed, 29 May 2024 05:36:26 +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 4VpymV253lz4b0f; Wed, 29 May 2024 05:36:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716960986; 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=dC3oSurCaJoalGs/AA6W/xnktHhbxF4pZW7K4bsHwfM=; b=AMqteLdbXRT2kj9P1cN8tz8ovXQ+r1zf4EtpUVhlniJCXnCOBSIC5VMP3yNfFX1l7vL7zy zNSq4L9cmOXx6xbzy4pGAJw1xcYpnj4Ix4174UM/1FQ05VTgiP8D4hQY8rmgKxqICsfrln meViIi+aMdCBL9K5LxyyDZK785Iu883E7UxzFgXbvXjUlpRGLo3BlwQ33jYm3DUhCBvAKG zP2torSdw9MCtsWDEsHIF7ws5IBDsAzrxgnyypR8kb7Je6u1OUyE5lUN1iCFj4K8fz0meO 1O3JXY9zAYl8A1aeJlbJOlducUAcGhbem6gLKKe2gNXQHbGPC0YIMv1x/8xiJg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1716960986; a=rsa-sha256; cv=none; b=f/HkBYBVbV0IfGcinCpp7yu20WDyBu1zELil6K9eEvwYKiUxx8M3rOZmoSRebtcXQCj+iQ FUqVIQL7OSAnrwij4q/SCDKA69OIlqcIjnTR7VI5/8IKcOOBEHCZMzjX+Tg+Nih8g/gjyr UHkxn4nZCS0ett40mQf/7nbeBQ470RbIjiuGgEz/Z7xeQH/2J7V52ZZN5d4br7EKd7VUoz s5w4ikPBx946LNqIvgc7yffIjHAfMAw9OOhvyMS2pdI+neyES+Q8J0CucVihMxNtebXbi0 ZLn5VTuUcf6WgCnfo4u7OBmvuyZwzrMi7gp6kgKKTBrq3rU0Ji3H5/a6AB63OQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716960986; 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=dC3oSurCaJoalGs/AA6W/xnktHhbxF4pZW7K4bsHwfM=; b=JmKrTKZXOOObaBtgN+zy0uiqVW8w3jpeojiYtPb5lE12y0K5yEc3pXvviaD79HDqfLdENs q8EyqwBqVgXYpiyCaEncbxpMvjuB1zCzqvyvPdYCWomOPdXjNnPhHldvKSXhbL/KOIbXbF BKlx1vEMECWgVvhj4XOJTPeF/Wv7AJjTQPQHsXXiOKs44ciq2abDwwuCacRJnblSaPonXG QOyJCD6LDHUFFhjxm368g+Ufj1ni5kXtQSYdHKq0G6b3aeTmGJvQvwOuVijFvh1dyl+qUp 1Bl/xjZpjGPOxmnneRT8UN68qrDIwGx3AdLSDWcaS2fpEyQYU1az9D7P2BxmeA== 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 4VpymV1KRtzk8p; Wed, 29 May 2024 05:36:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44T5aQHJ086295; Wed, 29 May 2024 05:36:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44T5aQ13086292; Wed, 29 May 2024 05:36:26 GMT (envelope-from git) Date: Wed, 29 May 2024 05:36:26 GMT Message-Id: <202405290536.44T5aQ13086292@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: 3426b8269cab - stable/13 - mqueuefs: minor style pass 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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: 3426b8269cab35e8d8b3ab33a876bd5fffa9d070 Auto-Submitted: auto-generated The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=3426b8269cab35e8d8b3ab33a876bd5fffa9d070 commit 3426b8269cab35e8d8b3ab33a876bd5fffa9d070 Author: Konstantin Belousov AuthorDate: 2024-05-22 02:52:47 +0000 Commit: Konstantin Belousov CommitDate: 2024-05-29 05:36:13 +0000 mqueuefs: minor style pass (cherry picked from commit 63f18b37e01ef214de762a091d3c98ae5028c8f4) --- sys/kern/uipc_mqueue.c | 47 +++++++++++++++++++++++------------------------ 1 file changed, 23 insertions(+), 24 deletions(-) diff --git a/sys/kern/uipc_mqueue.c b/sys/kern/uipc_mqueue.c index 2038de9324fc..5256a00cd831 100644 --- a/sys/kern/uipc_mqueue.c +++ b/sys/kern/uipc_mqueue.c @@ -50,7 +50,6 @@ * use the IPC facility without having to mount mqueue file system. */ -#include #include "opt_capsicum.h" #include @@ -379,7 +378,7 @@ mqfs_fileno_free(struct mqfs_info *mi, struct mqfs_node *mn) static __inline struct mqfs_node * mqnode_alloc(void) { - return uma_zalloc(mqnode_zone, M_WAITOK | M_ZERO); + return (uma_zalloc(mqnode_zone, M_WAITOK | M_ZERO)); } static __inline void @@ -451,8 +450,8 @@ mqfs_create_node(const char *name, int namelen, struct ucred *cred, int mode, node->mn_type = nodetype; node->mn_refcount = 1; vfs_timestamp(&node->mn_birth); - node->mn_ctime = node->mn_atime = node->mn_mtime - = node->mn_birth; + node->mn_ctime = node->mn_atime = node->mn_mtime = + node->mn_birth; node->mn_uid = cred->cr_uid; node->mn_gid = cred->cr_gid; node->mn_mode = mode; @@ -1020,8 +1019,8 @@ mqfs_create(struct vop_create_args *ap) /* * Remove an entry */ -static -int do_unlink(struct mqfs_node *pn, struct ucred *ucred) +static int +do_unlink(struct mqfs_node *pn, struct ucred *ucred) { struct mqfs_node *parent; struct mqfs_vdata *vd; @@ -1247,15 +1246,15 @@ mqfs_setattr(struct vop_setattr_args *ap) td = curthread; vap = ap->a_vap; vp = ap->a_vp; - if ((vap->va_type != VNON) || - (vap->va_nlink != VNOVAL) || - (vap->va_fsid != VNOVAL) || - (vap->va_fileid != VNOVAL) || - (vap->va_blocksize != VNOVAL) || + if (vap->va_type != VNON || + vap->va_nlink != VNOVAL || + vap->va_fsid != VNOVAL || + vap->va_fileid != VNOVAL || + vap->va_blocksize != VNOVAL || (vap->va_flags != VNOVAL && vap->va_flags != 0) || - (vap->va_rdev != VNOVAL) || - ((int)vap->va_bytes != VNOVAL) || - (vap->va_gen != VNOVAL)) { + vap->va_rdev != VNOVAL || + (int)vap->va_bytes != VNOVAL || + vap->va_gen != VNOVAL) { return (EINVAL); } @@ -1284,7 +1283,7 @@ mqfs_setattr(struct vop_setattr_args *ap) * check in VOP_ACCESS() be enough? Also, are the group bits * below definitely right? */ - if (((ap->a_cred->cr_uid != pn->mn_uid) || uid != pn->mn_uid || + if ((ap->a_cred->cr_uid != pn->mn_uid || uid != pn->mn_uid || (gid != pn->mn_gid && !groupmember(gid, ap->a_cred))) && (error = priv_check(td, PRIV_MQ_ADMIN)) != 0) return (error); @@ -1294,7 +1293,7 @@ mqfs_setattr(struct vop_setattr_args *ap) } if (vap->va_mode != (mode_t)VNOVAL) { - if ((ap->a_cred->cr_uid != pn->mn_uid) && + if (ap->a_cred->cr_uid != pn->mn_uid && (error = priv_check(td, PRIV_MQ_ADMIN))) return (error); pn->mn_mode = vap->va_mode; @@ -1348,11 +1347,11 @@ mqfs_read(struct vop_read_args *ap) mq = VTOMQ(vp); snprintf(buf, sizeof(buf), - "QSIZE:%-10ld MAXMSG:%-10ld CURMSG:%-10ld MSGSIZE:%-10ld\n", - mq->mq_totalbytes, - mq->mq_maxmsg, - mq->mq_curmsgs, - mq->mq_msgsize); + "QSIZE:%-10ld MAXMSG:%-10ld CURMSG:%-10ld MSGSIZE:%-10ld\n", + mq->mq_totalbytes, + mq->mq_maxmsg, + mq->mq_curmsgs, + mq->mq_msgsize); buf[sizeof(buf)-1] = '\0'; len = strlen(buf); error = uiomove_frombuf(buf, len, uio); @@ -2019,7 +2018,7 @@ kern_kmq_open(struct thread *td, const char *upath, int flags, mode_t mode, AUDIT_ARG_MODE(mode); pdp = td->td_proc->p_pd; - cmode = (((mode & ~pdp->pd_cmask) & ALLPERMS) & ~S_ISTXT); + cmode = ((mode & ~pdp->pd_cmask) & ALLPERMS) & ~S_ISTXT; mq = NULL; if ((flags & O_CREAT) != 0 && attr != NULL) { if (attr->mq_maxmsg <= 0 || attr->mq_maxmsg > maxmsg) @@ -2815,7 +2814,7 @@ freebsd32_kmq_timedsend(struct thread *td, abs_timeout = NULL; waitok = !(fp->f_flag & O_NONBLOCK); error = mqueue_send(mq, uap->msg_ptr, uap->msg_len, - uap->msg_prio, waitok, abs_timeout); + uap->msg_prio, waitok, abs_timeout); out: fdrop(fp, td); return (error); @@ -2846,7 +2845,7 @@ freebsd32_kmq_timedreceive(struct thread *td, abs_timeout = NULL; waitok = !(fp->f_flag & O_NONBLOCK); error = mqueue_receive(mq, uap->msg_ptr, uap->msg_len, - uap->msg_prio, waitok, abs_timeout); + uap->msg_prio, waitok, abs_timeout); out: fdrop(fp, td); return (error);