git: b52d35520c51 - stable/13 - Fix clerical error in page alloc
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Mon, 11 Jul 2022 05:41:25 UTC
The branch stable/13 has been updated by dougm:
URL: https://cgit.FreeBSD.org/src/commit/?id=b52d35520c51b885f68256b1b5cd1931d07add49
commit b52d35520c51b885f68256b1b5cd1931d07add49
Author: Doug Moore <dougm@FreeBSD.org>
AuthorDate: 2021-12-24 08:47:21 +0000
Commit: Doug Moore <dougm@FreeBSD.org>
CommitDate: 2022-07-11 05:41:06 +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
(cherry picked from commit 184c63db3c949d8ba766dc7b2bd2f082404e169d)
---
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 2b9e46674bdf..4db88c91cba4 100644
--- a/sys/vm/vm_page.c
+++ b/sys/vm/vm_page.c
@@ -2195,11 +2195,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.
*/