Date: Sat, 27 Jun 2009 22:23:06 +0000 (UTC) From: Kip Macy <kmacy@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r195126 - in user/kmacy/releng_7_2_fcs/sys: kern vm Message-ID: <200906272223.n5RMN6PI090184@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: kmacy Date: Sat Jun 27 22:23:06 2009 New Revision: 195126 URL: http://svn.freebsd.org/changeset/base/195126 Log: object lock needs to held prior to page lock Modified: user/kmacy/releng_7_2_fcs/sys/kern/subr_witness.c user/kmacy/releng_7_2_fcs/sys/vm/vm_pageout.c Modified: user/kmacy/releng_7_2_fcs/sys/kern/subr_witness.c ============================================================================== --- user/kmacy/releng_7_2_fcs/sys/kern/subr_witness.c Sat Jun 27 21:59:47 2009 (r195125) +++ user/kmacy/releng_7_2_fcs/sys/kern/subr_witness.c Sat Jun 27 22:23:06 2009 (r195126) @@ -607,9 +607,9 @@ static struct witness_order_list_entry o * VM * */ + { "vm object", &lock_class_mtx_sleep }, { "page lock", &lock_class_mtx_sleep }, { "vm page queue mutex", &lock_class_mtx_sleep }, - { "vm object", &lock_class_mtx_sleep }, { "pmap", &lock_class_mtx_sleep }, { NULL, NULL }, /* Modified: user/kmacy/releng_7_2_fcs/sys/vm/vm_pageout.c ============================================================================== --- user/kmacy/releng_7_2_fcs/sys/vm/vm_pageout.c Sat Jun 27 21:59:47 2009 (r195125) +++ user/kmacy/releng_7_2_fcs/sys/vm/vm_pageout.c Sat Jun 27 22:23:06 2009 (r195126) @@ -255,8 +255,8 @@ vm_pageout_fallback_object_lock(vm_page_ m, &marker, pageq); vm_page_unlock_queues(); vm_page_unlock(m); - vm_page_lock(m); VM_OBJECT_LOCK(object); + vm_page_lock(m); vm_page_lock_queues(); /* Page queue might have changed. */
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200906272223.n5RMN6PI090184>