Date: Mon, 27 May 2013 16:29:54 +0000 (UTC) From: Attilio Rao <attilio@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r251032 - user/attilio/vmobj-readlock/sys/kern Message-ID: <201305271629.r4RGTsYN065934@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: attilio Date: Mon May 27 16:29:53 2013 New Revision: 251032 URL: http://svnweb.freebsd.org/changeset/base/251032 Log: Fix brain-o. Sponsored by: EMC / Isilon storage division Modified: user/attilio/vmobj-readlock/sys/kern/uipc_shm.c Modified: user/attilio/vmobj-readlock/sys/kern/uipc_shm.c ============================================================================== --- user/attilio/vmobj-readlock/sys/kern/uipc_shm.c Mon May 27 16:23:48 2013 (r251031) +++ user/attilio/vmobj-readlock/sys/kern/uipc_shm.c Mon May 27 16:29:53 2013 (r251032) @@ -280,9 +280,10 @@ shm_dotruncate(struct shmfd *shmfd, off_ idx = OFF_TO_IDX(length); retry: m = vm_page_lookup(object, idx); - if (m != NULL && vm_page_sleep_if_busy(m, "shmtrc")) - goto retry; - else if (vm_pager_has_page(object, idx, NULL, NULL)) { + if (m != NULL) { + if (vm_page_sleep_if_busy(m, "shmtrc")) + goto retry; + } else if (vm_pager_has_page(object, idx, NULL, NULL)) { m = vm_page_alloc(object, idx, VM_ALLOC_NORMAL); if (m == NULL) { VM_OBJECT_WUNLOCK(object);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201305271629.r4RGTsYN065934>