From nobody Fri Jun 17 19:40:45 2022 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 3955785D1F5; Fri, 17 Jun 2022 19:40:48 +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 4LPqCL6MZ3z3htK; Fri, 17 Jun 2022 19:40:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655494847; 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=oiNukAtLAklSGPQYLZdE/eP1/Npvtv9nEsVMpSZVJN8=; b=wPqfsJP5uV7F3Lk9xGrtkDaqt1MKI6paZza+dHlDRzduNQPgsfnG0CUovocq1Rd5RNrGsh fHmAeA4lK5jfpSqMdPBo4YVH4O8w9HS8ega5/o2Kh3LdFNhzbeIk7hKO0CDw4TRjed2z0Y 5qb25m/KUkhh2oNvRXjVDWhBqmQrfi0bwoYTmHeL/YEEs7vG4EgLq7eh1WF4U3egEyiBjz 9Jgg+wMbZ08DIorU/NLdJH9WlBTyMXLhKzFkcNgqRUvmBwo3WYC07zeWIVMDzOQCuWyPiH GlE7oMq1oTCNUv4lMUG59aXl26clEs4dyAxGhOVuponvr8nqd/qq0Yh22sSdYw== 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 0C11F259D1; Fri, 17 Jun 2022 19:40: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 25HJejGC026241; Fri, 17 Jun 2022 19:40:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25HJejVq026240; Fri, 17 Jun 2022 19:40:45 GMT (envelope-from git) Date: Fri, 17 Jun 2022 19:40:45 GMT Message-Id: <202206171940.25HJejVq026240@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dmitry Chagin Subject: git: 7d2b9eb04c66 - stable/13 - kqueue: Trim trailing whitespace 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: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 7d2b9eb04c6639961ea745d350bf58879f5e1e02 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655494847; 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=oiNukAtLAklSGPQYLZdE/eP1/Npvtv9nEsVMpSZVJN8=; b=NnQaWJe59OwuKVUB6w+N3kFd4KTvEu0zmjMq/jAoaF45IgWX29I09iYEEbqk7Ln5PxJ5bT F+mmZ67FIDU3hCi91Emv/1M1BlCxdphEafBRfKttMZqrpUqD2ogLaelau/jM9vsFWSi4V0 NcmXiBNZBECXeff7tIhkRqOUjjPSsfso66KB4v6pZ+B3II0PtXM/ow0AAI0L8VuYgdokPk zPEXYNEO4xHz1M8lDuLe+mtAth9CqBwGcjcT7UC4xmbPCsNq/p0MArGjK2jPR11KrlsIFn mxAipRIXZ8DiAAeIhZdiYIy1qhHH1XWr2QwAU2Kt3eikDBqVuuQGbrQbq/R61Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1655494847; a=rsa-sha256; cv=none; b=ClIVqxQ/6tDPIFInS/R3Hy2D8qIBwrboXY2lKgCOyS1+2ZWFQ1NzdcLXDSwmPFbdvB5JjZ nW9SaBKE1RcRbTUrSy5y5SEtT9X58iZGk2XaFtYGz1oQ8o63LqqfPfDCl4WvoVpp2Ofq4j CTO0GrAC+1uECYuB0cdsFy+CY/vbwUkFiFJd7ugnHRakktINEp3ZRe7Zvznh4eFUHII5ZZ iVgpArRRL194FzNLSS47A8v4KpTf4JKeUOudzb/6OLYYTlTmWMJibjGArAhKyvT3YYPnRO deydy97Zq7h0un7YxtCpJKQ2s81TOxz0h7BMZ3plaV+aKsPe4Ea5pmvBRuYcJw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=7d2b9eb04c6639961ea745d350bf58879f5e1e02 commit 7d2b9eb04c6639961ea745d350bf58879f5e1e02 Author: Dmitry Chagin AuthorDate: 2022-05-19 16:52:02 +0000 Commit: Dmitry Chagin CommitDate: 2022-06-17 19:35:24 +0000 kqueue: Trim trailing whitespace MFC after: 1 week (cherry picked from commit 2479e381cd5fe21c1f1c516ee42dfdd1fcc9abfc) --- sys/kern/kern_event.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/sys/kern/kern_event.c b/sys/kern/kern_event.c index 90acafa8d66b..10959685fdbd 100644 --- a/sys/kern/kern_event.c +++ b/sys/kern/kern_event.c @@ -892,7 +892,7 @@ filt_timerdetach(struct knote *kn) static void filt_timertouch(struct knote *kn, struct kevent *kev, u_long type) { - struct kq_timer_cb_data *kc; + struct kq_timer_cb_data *kc; struct kqueue *kq; sbintime_t to; int error; @@ -929,7 +929,7 @@ filt_timertouch(struct knote *kn, struct kevent *kev, u_long type) kn->kn_status &= ~KN_ACTIVE; kn->kn_data = 0; KQ_UNLOCK(kq); - + /* Reschedule timer based on new data/fflags */ kn->kn_sfflags = kev->fflags; kn->kn_sdata = kev->data; @@ -967,9 +967,9 @@ static int filt_userattach(struct knote *kn) { - /* + /* * EVFILT_USER knotes are not attached to anything in the kernel. - */ + */ kn->kn_hook = NULL; if (kn->kn_fflags & NOTE_TRIGGER) kn->kn_hookid = 1; @@ -1580,7 +1580,7 @@ findkn: * note. Don't attempt to coalesce this with an * existing note. */ - ; + ; } else if (kq->kq_knhashmask != 0) { struct klist *list; @@ -1701,7 +1701,7 @@ findkn: done_ev_add: /* * We can get here with kn->kn_knlist == NULL. This can happen when - * the initial attach event decides that the event is "completed" + * the initial attach event decides that the event is "completed" * already, e.g., filt_procattach() is called on a zombie process. It * will call filt_proc() which will remove it from the list, and NULL * kn_knlist. @@ -2051,8 +2051,8 @@ retry: KQ_LOCK(kq); KQ_GLOBAL_UNLOCK(&kq_global, haskqglobal); if (kn->kn_flags & (EV_CLEAR | EV_DISPATCH)) { - /* - * Manually clear knotes who weren't + /* + * Manually clear knotes who weren't * 'touch'ed. */ if (touch == 0 && kn->kn_flags & EV_CLEAR) { @@ -2065,7 +2065,7 @@ retry: kq->kq_count--; } else TAILQ_INSERT_TAIL(&kq->kq_head, kn, kn_tqe); - + kn->kn_status &= ~KN_SCAN; kn_leave_flux(kn); kn_list_unlock(knl); @@ -2822,7 +2822,7 @@ knote_free(struct knote *kn) /* * Register the kev w/ the kq specified by fd. */ -int +int kqfd_register(int fd, struct kevent *kev, struct thread *td, int mflag) { struct kqueue *kq;