From nobody Fri Sep 30 02:04:07 2022 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 4Mdtng6RCKz4df3S; Fri, 30 Sep 2022 02:04:07 +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 4Mdtng5kxMz3dv1; Fri, 30 Sep 2022 02:04:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664503447; 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=CbafuqMgoY93AXrx2rldXIhLSHbkZdeBrqrlXBrc+EQ=; b=BJD/QLAuGbVkVW6oP3Q4NReOlJ55IN+gCZBRmG4vVvwOT8uy8KFNoT0Ff9g+eYoFNbY2q0 J+DE+Y3CWJezx+9qZI92TRKnnoxvtaZUHBEHdlL2YZV4kT+Pi/sCjmo5fTFIXcsqf12FgA ztZBCoxmPQomYcPAZTuoXyvl3PWGXcOQU9mwQzAtG4Lgw12KMVPZ2ngW79ae79YpAVChiv CXYm/BQtAVKIr7uV5PQtoOBStI8kesT8Na/QF7q680e/QQ5T/3vnsR3o2T+pL3iEqrvPka de1oahF+RFbvhapsPorrmNtGvBle1mLjbPc0iVNeFMCQ2B/zNnC1DinXjjcimA== 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 4Mdtng4qCRz11qk; Fri, 30 Sep 2022 02:04:07 +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 28U247na099062; Fri, 30 Sep 2022 02:04:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 28U247Dp099061; Fri, 30 Sep 2022 02:04:07 GMT (envelope-from git) Date: Fri, 30 Sep 2022 02:04:07 GMT Message-Id: <202209300204.28U247Dp099061@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: fc15cf8786e2 - stable/13 - swap_pager: style, wrap long lines 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/13 X-Git-Reftype: branch X-Git-Commit: fc15cf8786e25383f0e45c51ad5bc7f2c26e16b2 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664503447; 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=CbafuqMgoY93AXrx2rldXIhLSHbkZdeBrqrlXBrc+EQ=; b=F0XDaIg3Iu0sXUFfvM1iYWo6n1fPSoqNuUjp5NUJcgrhQrW18y/aXUElgw0ibzTjXpSnHc CkWOJ2ACAF+95DLStmdCdZTWTabcX3Ov6l80LqOXoDUdZtrhaR1+7z/htVPxa4BYt0pfIz Sfiyenf38+LRra18yZ4386SwLTtvRPuuNgPGR+leaqJwsx8/bSthSv/vBIWXwknfVwsbJj Cabs9YGIZ3QlMbOBIpx++RY5qVzHOT3USa8aUQEV0MOsRWKGh9oslfSXGJesfnnhPs1Z2k pTzFFoWUbEO7xGsSZpXUZYVu3sJadkr+OwPYGNxdJSzbCEN4Q07/V1C+IBMxLg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1664503447; a=rsa-sha256; cv=none; b=PNNORgO7NN6b69qGHVSYnk1Wrj6G01y+8wbdSDE5UyHPtN5pH+zGGAwzhF7HriYFfxn9pW kvf1Cu7IH7thW3ouOnxdQsZ/O7hZpD139Sz72Z9pFCmbw6yJ2QZYU6TuylXMSr5Pk3CsS5 6vJVu1DB7ywkU8gKhSXKGv+lDwjIGI0QKFkh71iSPOoDPepAx1z4XrwdN+b5AUFrlct4LV 0G0xvhkCXAz1McB5eOxnUgjXoSUagzRR3GUO29s+uBLBqQD8GynQ+LjAER5HInX/g2Vst7 +5aExNDKdQzRURRg15CFKfZfkaTOsiUn+kJj/rHxL6CShN8R4jYabVGHweslSg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=fc15cf8786e25383f0e45c51ad5bc7f2c26e16b2 commit fc15cf8786e25383f0e45c51ad5bc7f2c26e16b2 Author: Konstantin Belousov AuthorDate: 2022-09-13 10:03:11 +0000 Commit: Konstantin Belousov CommitDate: 2022-09-30 00:29:09 +0000 swap_pager: style, wrap long lines (cherry picked from commit 26eed2aa06a2e523ffd4191ac67818242d5035e7) --- sys/vm/swap_pager.c | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/sys/vm/swap_pager.c b/sys/vm/swap_pager.c index 67dc093f1e94..0cd8b498dc4f 100644 --- a/sys/vm/swap_pager.c +++ b/sys/vm/swap_pager.c @@ -213,7 +213,8 @@ swap_reserve_by_cred_rlimit(u_long pincr, struct ucred *cred, int oc) prev + pincr > lim_cur(curthread, RLIMIT_SWAP) && priv_check(curthread, PRIV_VM_SWAP_NORLIMIT) != 0) { prev = atomic_fetchadd_long(&uip->ui_vmsize, -pincr); - KASSERT(prev >= pincr, ("negative vmsize for uid = %d\n", uip->ui_uid)); + KASSERT(prev >= pincr, + ("negative vmsize for uid %d\n", uip->ui_uid)); return (false); } return (true); @@ -231,7 +232,8 @@ swap_release_by_cred_rlimit(u_long pdecr, struct ucred *cred) #ifdef INVARIANTS prev = atomic_fetchadd_long(&uip->ui_vmsize, -pdecr); - KASSERT(prev >= pdecr, ("negative vmsize for uid = %d\n", uip->ui_uid)); + KASSERT(prev >= pdecr, + ("negative vmsize for uid %d\n", uip->ui_uid)); #else atomic_subtract_long(&uip->ui_vmsize, pdecr); #endif @@ -264,8 +266,8 @@ swap_reserve_by_cred(vm_ooffset_t incr, struct ucred *cred) static int curfail; static struct timeval lastfail; - KASSERT((incr & PAGE_MASK) == 0, ("%s: incr: %ju & PAGE_MASK", __func__, - (uintmax_t)incr)); + KASSERT((incr & PAGE_MASK) == 0, ("%s: incr: %ju & PAGE_MASK", + __func__, (uintmax_t)incr)); #ifdef RACCT if (RACCT_ENABLED()) { @@ -289,13 +291,15 @@ swap_reserve_by_cred(vm_ooffset_t incr, struct ucred *cred) if ((oc & SWAP_RESERVE_FORCE_ON) != 0 && r > s && priv_check(curthread, PRIV_VM_SWAP_NOQUOTA) != 0) { prev = atomic_fetchadd_long(&swap_reserved, -pincr); - KASSERT(prev >= pincr, ("swap_reserved < incr on overcommit fail")); + KASSERT(prev >= pincr, + ("swap_reserved < incr on overcommit fail")); goto out_error; } if (!swap_reserve_by_cred_rlimit(pincr, cred, oc)) { prev = atomic_fetchadd_long(&swap_reserved, -pincr); - KASSERT(prev >= pincr, ("swap_reserved < incr on overcommit fail")); + KASSERT(prev >= pincr, + ("swap_reserved < incr on overcommit fail")); goto out_error; } @@ -303,7 +307,8 @@ swap_reserve_by_cred(vm_ooffset_t incr, struct ucred *cred) out_error: if (ppsratecheck(&lastfail, &curfail, 1)) { - printf("uid %d, pid %d: swap reservation for %jd bytes failed\n", + printf("uid %d, pid %d: swap reservation " + "for %jd bytes failed\n", cred->cr_ruidinfo->ui_uid, curproc->p_pid, incr); } #ifdef RACCT @@ -322,8 +327,8 @@ swap_reserve_force(vm_ooffset_t incr) { u_long pincr; - KASSERT((incr & PAGE_MASK) == 0, ("%s: incr: %ju & PAGE_MASK", __func__, - (uintmax_t)incr)); + KASSERT((incr & PAGE_MASK) == 0, ("%s: incr: %ju & PAGE_MASK", + __func__, (uintmax_t)incr)); #ifdef RACCT if (RACCT_ENABLED()) { @@ -356,8 +361,8 @@ swap_release_by_cred(vm_ooffset_t decr, struct ucred *cred) u_long prev; #endif - KASSERT((decr & PAGE_MASK) == 0, ("%s: decr: %ju & PAGE_MASK", __func__, - (uintmax_t)decr)); + KASSERT((decr & PAGE_MASK) == 0, ("%s: decr: %ju & PAGE_MASK", + __func__, (uintmax_t)decr)); pdecr = atop(decr); #ifdef INVARIANTS