From nobody Sat Sep 09 08:27:00 2023 X-Original-To: dev-commits-src-all@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 4RjR0h5vXfz4sP1x; Sat, 9 Sep 2023 08:27:00 +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 4RjR0h2yQyz4Lyd; Sat, 9 Sep 2023 08:27:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694248020; 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=0g8vBkqBa8XEuZ2OuC1jvbEAmh0SxXudc+3FBiOZiAw=; b=l7DRw9Gu3ooyo4epIUaGV0e4kswUodNjLeOuUcB+vXWqk4PnM5TwjedBEVCNIRJuVsLoZM +KxUPZjDgKSC1xWNWba/qJ+K2pxmTZ+YMy3UYJIIwm/6EkdmnyVuzoqex0hl67TnsTMcc6 Si5B7qv/HU6MI+lCJFYP+p6ctHp1U3M5tN/fyFtMYI37ELV0qcscaKb5GhPME63hoOxHrS MMV3G8Ob9c1E7eaGytqQaxZ+JZib6QDs0/N95xV0bkPrc0zpXoySw0tzHnWy6lynTCWU3W M8EP3cvSuiVS2XorZ9h2gT5iqIRlwsH80JBqjBa6HxzTHqgmq8/LODb5SSvf6w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694248020; a=rsa-sha256; cv=none; b=if8G4+PcRvtZHRZNGWOjITSrbq2yiRA/VlxkZJR8u8nUU1NtAzh2AREISq9wUipITFwIqg 3aB66swLIjvw48z4Rm9mhuDXC/2hzkr3npeiPC8SieJGWnOr8/boLvvFJB+EP3XSb8iZFf 4L+diFbvyLDDHwIRB34Z0FxOXsf9Ep/51X7vSfposv+Nkiwe7aVq6dsWIv2oWrOnP19KH5 r2+Nc6y1AaaiqHjjG3RTtVl++seI/JPMMf9mv1NPjgZ+ZjtBHnRQ1WX33GnGzzOqCTqwK8 FEMfl1uCQARNJ1ntkT8MTSu8KsJKlvSZRfS/KtIky3tPWZ7HXWWA6fPS58cEuw== 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=1694248020; 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=0g8vBkqBa8XEuZ2OuC1jvbEAmh0SxXudc+3FBiOZiAw=; b=ENwpeuJ63B4TRQG3gs32+Y9LrEdOLInN9TJbXEXWBdpWLtV/YtjjYrKSDxsX8z2OoErBuW d0R9uazofOYkrrvlnUFz5Jw3YJY5/tYSv/CVu5jiwJth4Vu7oyJwn0mJfTEl70c8WkQ3u8 3/FVcLQ7coA2hRLzuQX2Z3t4QeYCHRB5isbo0wXntmXTK/BXNZ9vbSNcNLPFSweQpzjxn7 4Vs+TFQkglX1jkkbGaVabZVFZyHXiYVXQ/+79WaII9nYQ6Wqvqut7yGZhxt/jJc5ytuO3L l6W8Qfr0eVxlLek+KDE7NSco0a2Yl9Rgce0LkLFC3E/vK6N84J9cpK82DQOJFA== 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 4RjR0h1m1tz319; Sat, 9 Sep 2023 08:27:00 +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 3898R0a0053600; Sat, 9 Sep 2023 08:27:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3898R0a8053597; Sat, 9 Sep 2023 08:27:00 GMT (envelope-from git) Date: Sat, 9 Sep 2023 08:27:00 GMT Message-Id: <202309090827.3898R0a8053597@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: c3325cc44d0b - stable/14 - kern_kthread.c: some style List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/14 X-Git-Reftype: branch X-Git-Commit: c3325cc44d0b7ecc6749e4f0d7575412e78fd7f8 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=c3325cc44d0b7ecc6749e4f0d7575412e78fd7f8 commit c3325cc44d0b7ecc6749e4f0d7575412e78fd7f8 Author: Konstantin Belousov AuthorDate: 2023-09-02 07:05:49 +0000 Commit: Konstantin Belousov CommitDate: 2023-09-09 08:26:33 +0000 kern_kthread.c: some style (cherry picked from commit ea70866bb15dd707c1a6a729c44e5ae611c83dd1) --- sys/kern/kern_kthread.c | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/sys/kern/kern_kthread.c b/sys/kern/kern_kthread.c index bf481cafc72e..3604d63531da 100644 --- a/sys/kern/kern_kthread.c +++ b/sys/kern/kern_kthread.c @@ -63,7 +63,7 @@ kproc_start(const void *udata) int error; error = kproc_create((void (*)(void *))kp->func, NULL, - kp->global_procpp, 0, 0, "%s", kp->arg0); + kp->global_procpp, 0, 0, "%s", kp->arg0); if (error) panic("kproc_start: %s: error %d", kp->arg0, error); } @@ -97,8 +97,8 @@ kproc_create(void (*func)(void *), void *arg, fr.fr_pages = pages; fr.fr_procp = &p2; error = fork1(&thread0, &fr); - if (error) - return error; + if (error != 0) + return (error); /* save a global descriptor, if desired */ if (newpp != NULL) @@ -134,12 +134,12 @@ kproc_create(void (*func)(void *), void *arg, sched_user_prio(td, PUSER); /* Delay putting it on the run queue until now. */ - if (!(flags & RFSTOPPED)) + if ((flags & RFSTOPPED) == 0) sched_add(td, SRQ_BORING); else thread_unlock(td); - return 0; + return (0); } void @@ -188,7 +188,8 @@ kproc_suspend(struct proc *p, int timo) } SIGADDSET(p->p_siglist, SIGSTOP); wakeup(p); - return msleep(&p->p_siglist, &p->p_mtx, PPAUSE | PDROP, "suspkp", timo); + return (msleep(&p->p_siglist, &p->p_mtx, PPAUSE | PDROP, + "suspkp", timo)); } int @@ -230,11 +231,11 @@ kproc_suspend_check(struct proc *p) void kthread_start(const void *udata) { - const struct kthread_desc *kp = udata; + const struct kthread_desc *kp = udata; int error; error = kthread_add((void (*)(void *))kp->func, NULL, - NULL, kp->global_threadpp, 0, 0, "%s", kp->arg0); + NULL, kp->global_threadpp, 0, 0, "%s", kp->arg0); if (error) panic("kthread_start: %s: error %d", kp->arg0, error); } @@ -313,13 +314,13 @@ kthread_add(void (*func)(void *), void *arg, struct proc *p, PMC_CALL_HOOK_UNLOCKED(td, PMC_FN_THR_CREATE_LOG, NULL); #endif /* Delay putting it on the run queue until now. */ - if (!(flags & RFSTOPPED)) { + if ((flags & RFSTOPPED) == 0) { thread_lock(newtd); sched_add(newtd, SRQ_BORING); } if (newtdp) *newtdp = newtd; - return 0; + return (0); } void @@ -451,8 +452,8 @@ kthread_suspend_check(void) int kproc_kthread_add(void (*func)(void *), void *arg, - struct proc **procptr, struct thread **tdptr, - int flags, int pages, const char *procname, const char *fmt, ...) + struct proc **procptr, struct thread **tdptr, + int flags, int pages, const char *procname, const char *fmt, ...) { int error; va_list ap; @@ -461,7 +462,7 @@ kproc_kthread_add(void (*func)(void *), void *arg, if (*procptr == NULL) { error = kproc_create(func, arg, - procptr, flags, pages, "%s", procname); + procptr, flags, pages, "%s", procname); if (error) return (error); td = FIRST_THREAD_IN_PROC(*procptr); @@ -479,6 +480,6 @@ kproc_kthread_add(void (*func)(void *), void *arg, vsnprintf(buf, sizeof(buf), fmt, ap); va_end(ap); error = kthread_add(func, arg, *procptr, - tdptr, flags, pages, "%s", buf); + tdptr, flags, pages, "%s", buf); return (error); }