Date: Fri, 24 Dec 2021 08:51:39 GMT From: Doug Moore <dougm@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: 184c63db3c94 - main - Fix clerical error in page alloc Message-ID: <202112240851.1BO8pdnH043305@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by dougm: URL: https://cgit.FreeBSD.org/src/commit/?id=184c63db3c949d8ba766dc7b2bd2f082404e169d commit 184c63db3c949d8ba766dc7b2bd2f082404e169d Author: Doug Moore <dougm@FreeBSD.org> AuthorDate: 2021-12-24 08:47:21 +0000 Commit: Doug Moore <dougm@FreeBSD.org> CommitDate: 2021-12-24 08:47:21 +0000 Fix clerical error in page alloc Fix a very recent change that introduced a page accounting error in case of a reserveration being broken. Reviewed by: alc Fixes: fb38b29b5609 (page_alloc_br) vm_page: Remove extra test, dup code from page alloc Differential Revision: https://reviews.freebsd.org/D33645 --- sys/vm/vm_page.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/vm/vm_page.c b/sys/vm/vm_page.c index c24da96f4312..03351b0ad3dd 100644 --- a/sys/vm/vm_page.c +++ b/sys/vm/vm_page.c @@ -2186,11 +2186,11 @@ vm_page_find_contig_domain(int domain, int req, u_long npages, vm_paddr_t low, vm_page_t m_ret; vmd = VM_DOMAIN(domain); - if (!vm_domain_allocate(vmd, req, npages)) - return (NULL); #if VM_NRESERVLEVEL > 0 again: #endif + if (!vm_domain_allocate(vmd, req, npages)) + return (NULL); /* * Try to allocate the pages from the free page queues. */
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202112240851.1BO8pdnH043305>