From nobody Tue Jan 18 13:36:27 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 3190A1963AAE; Tue, 18 Jan 2022 13:36:28 +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 4JdVDC6cFdz3qfD; Tue, 18 Jan 2022 13:36:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642512988; 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=hruht8xtJjG53lsGPkydkQfRsFhV9ywKRbBbvepqWxI=; b=M06D8CVZ81tUlbayGsP6lPzsZ29X1E/hE2KStUiQYX0EhnfGwrqQr+PDfwf9tOwETAprF7 j+mw1YapRnqnd9Jacq/tlWFg8SzfL4efLtfSI/AmReI3gaCm4BmhP9zJu9bZfRQhbWx9zo boBe++pLjD1mBlZbELWq7BglgsyjxwG6sE3Ldr87qGZLsAr9NA9zgNeznNSzUmbSmGd+f4 D2rs/FPV3C28V/URGdeFLNgLDtPJUB62181fptOTJzWc4iNcI6ip6Cn6owdVwrdGGtvLH+ oDENQ3zZfgGutHdhPZnCUnHxSMX2zT2CRyp6WyR9ycbFYXIW/HsC2YOckoUf+g== 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 ABDDB222D7; Tue, 18 Jan 2022 13:36:27 +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 20IDaRlZ016758; Tue, 18 Jan 2022 13:36:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20IDaRki016757; Tue, 18 Jan 2022 13:36:27 GMT (envelope-from git) Date: Tue, 18 Jan 2022 13:36:27 GMT Message-Id: <202201181336.20IDaRki016757@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 3f85c51824a4 - stable/13 - swap_pager: uma_zcreate() doesn't fail 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 3f85c51824a4584c68bfc0aaf2a5618a618d4a3c Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642512988; 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=hruht8xtJjG53lsGPkydkQfRsFhV9ywKRbBbvepqWxI=; b=vAy2FKOV1zOgc5kT+N0yqZUGS5hM/ukQZWwpNPEjZyTuIhLdWIbAMRc5uiHvYvmhUIVMZw TWq6YIL4bgvWpZB0yt7m5+Q/yHpfdQGbo3oEBhislFF/5RJljkfxhx1jSt0ByjigsuaRB9 ziXaLcSPAWMunj5fcDzBLqQaZPmZo/xAcIJHnTKr29pxfmHNsuSITJtLLNP8rE99dYWSaV a4aut+nCJ0NLkF4BYwr0X5//qyMOujCw9cS6cvn+0JbeqBJ6oDUETYeOAah/MuvRzupjIa TvsONGYk1ov294ZLV3pcbUyzOu0DPMO7bynq/AzudSdrOSyjU6Hi8uExhA+UkQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1642512988; a=rsa-sha256; cv=none; b=c7lpBtxQoF756SJ+gafucyzNDZV/CYK7qjs3MmwqNcl9jPE8o/If4rQNEsO4MO8bRfOtcC e7K2P8oi3t24t7AlY5l/rPOqyIYre/kMVDJsnVniPTHtAI1wC2gF9P8nkynuL7JTZRb6lV Y3Fap43GOsuqKnnkgZoBx0dp79Ki+psfICCLnVkydypKWcmnBlm9povjTpmEffbLyvOtFg UFBLD9KSZVsl2lZT/Thz4aJPU5zCb93MFqoMfh5eSE3xiwf3Jw8OShNISl8G52rdoBR1NC LBXtrTSXP7be/L82FORoa0h46XdIKNRk6OK22KNi9en6b9UuhHC87PHeo/CbcQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=3f85c51824a4584c68bfc0aaf2a5618a618d4a3c commit 3f85c51824a4584c68bfc0aaf2a5618a618d4a3c Author: Mark Johnston AuthorDate: 2022-01-11 14:22:32 +0000 Commit: Mark Johnston CommitDate: 2022-01-18 13:36:13 +0000 swap_pager: uma_zcreate() doesn't fail Remove always-false checks for UMA zone creation failure. No functional change intended. Reviewed by: alc, kib Sponsored by: The FreeBSD Foundation (cherry picked from commit 43b3b8e52d642e94876728202d9b9863315c8525) --- sys/vm/swap_pager.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/sys/vm/swap_pager.c b/sys/vm/swap_pager.c index 3725fc87379f..59d996492b90 100644 --- a/sys/vm/swap_pager.c +++ b/sys/vm/swap_pager.c @@ -627,12 +627,8 @@ swap_pager_swap_init(void) vm_cnt.v_page_count / 2; swpctrie_zone = uma_zcreate("swpctrie", pctrie_node_size(), NULL, NULL, pctrie_zone_init, NULL, UMA_ALIGN_PTR, 0); - if (swpctrie_zone == NULL) - panic("failed to create swap pctrie zone."); swblk_zone = uma_zcreate("swblk", sizeof(struct swblk), NULL, NULL, NULL, NULL, _Alignof(struct swblk) - 1, 0); - if (swblk_zone == NULL) - panic("failed to create swap blk zone."); n2 = n; do { if (uma_zone_reserve_kva(swblk_zone, n))