Date: Sat, 22 Jun 2013 13:11:27 +0000 (UTC) From: Attilio Rao <attilio@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r252096 - user/attilio/vmobj-readlock/sys/vm Message-ID: <201306221311.r5MDBRGX034364@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: attilio Date: Sat Jun 22 13:11:27 2013 New Revision: 252096 URL: http://svnweb.freebsd.org/changeset/base/252096 Log: Complete further r252046. Sponsored by: EMC / Isilon storage division Modified: user/attilio/vmobj-readlock/sys/vm/swap_pager.c Modified: user/attilio/vmobj-readlock/sys/vm/swap_pager.c ============================================================================== --- user/attilio/vmobj-readlock/sys/vm/swap_pager.c Sat Jun 22 12:50:05 2013 (r252095) +++ user/attilio/vmobj-readlock/sys/vm/swap_pager.c Sat Jun 22 13:11:27 2013 (r252096) @@ -1708,8 +1708,7 @@ swp_pager_force_pagein(vm_object_t objec vm_page_t m; vm_object_pip_add(object, 1); - m = vm_page_grab(object, pindex, VM_ALLOC_NORMAL | VM_ALLOC_RETRY | - VM_ALLOC_NOBUSY); + m = vm_page_grab(object, pindex, VM_ALLOC_NORMAL | VM_ALLOC_RETRY); if (m->valid == VM_PAGE_BITS_ALL) { vm_object_pip_subtract(object, 1); vm_page_dirty(m); @@ -1721,7 +1720,6 @@ swp_pager_force_pagein(vm_object_t objec return; } - vm_page_busy(m); if (swap_pager_getpages(object, &m, 1, 0) != VM_PAGER_OK) panic("swap_pager_force_pagein: read from swap failed");/*XXX*/ vm_object_pip_subtract(object, 1);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201306221311.r5MDBRGX034364>