Date: Thu, 2 Apr 2015 19:10:34 +0000 (UTC) From: Alan Cox <alc@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r281001 - stable/10/sys/vm Message-ID: <201504021910.t32JAYo2036381@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: alc Date: Thu Apr 2 19:10:33 2015 New Revision: 281001 URL: https://svnweb.freebsd.org/changeset/base/281001 Log: MFC r280238 Fix the root cause of the "vm_reserv_populate: reserv <address> is already promoted" panics. PR: 198163 Modified: stable/10/sys/vm/vm_fault.c Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/vm/vm_fault.c ============================================================================== --- stable/10/sys/vm/vm_fault.c Thu Apr 2 18:57:35 2015 (r281000) +++ stable/10/sys/vm/vm_fault.c Thu Apr 2 19:10:33 2015 (r281001) @@ -101,6 +101,7 @@ __FBSDID("$FreeBSD$"); #include <vm/vm_kern.h> #include <vm/vm_pager.h> #include <vm/vm_extern.h> +#include <vm/vm_reserv.h> #define PFBAK 4 #define PFFOR 4 @@ -844,6 +845,14 @@ vnode_locked: unlock_and_deallocate(&fs); goto RetryFault; } +#if VM_NRESERVLEVEL > 0 + /* + * Rename the reservation. + */ + vm_reserv_rename(fs.m, fs.first_object, + fs.object, OFF_TO_IDX( + fs.first_object->backing_object_offset)); +#endif vm_page_xbusy(fs.m); fs.first_m = fs.m; fs.m = NULL;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201504021910.t32JAYo2036381>