svn commit: r251031 - in user/attilio/vmobj-readlock/sys: fs/tmpfs kern
Attilio Rao
attilio at FreeBSD.org
Mon May 27 16:23:49 UTC 2013
Author: attilio
Date: Mon May 27 16:23:48 2013
New Revision: 251031
URL: http://svnweb.freebsd.org/changeset/base/251031
Log:
Use vm_page_sleep_if_busy() in 2 places where it is not used yet.
Sponsored by: EMC / Isilon storage division
Modified:
user/attilio/vmobj-readlock/sys/fs/tmpfs/tmpfs_subr.c
user/attilio/vmobj-readlock/sys/kern/uipc_shm.c
Modified: user/attilio/vmobj-readlock/sys/fs/tmpfs/tmpfs_subr.c
==============================================================================
--- user/attilio/vmobj-readlock/sys/fs/tmpfs/tmpfs_subr.c Mon May 27 16:16:28 2013 (r251030)
+++ user/attilio/vmobj-readlock/sys/fs/tmpfs/tmpfs_subr.c Mon May 27 16:23:48 2013 (r251031)
@@ -1329,14 +1329,8 @@ tmpfs_reg_resize(struct vnode *vp, off_t
retry:
m = vm_page_lookup(uobj, idx);
if (m != NULL) {
- if ((m->oflags & VPO_BUSY) != 0 ||
- m->busy != 0) {
- vm_page_lock(m);
- VM_OBJECT_WUNLOCK(uobj);
- vm_page_sleep(m, "tmfssz");
- VM_OBJECT_WLOCK(uobj);
+ if (vm_page_sleep_if_busy(m, "tmfssz"))
goto retry;
- }
MPASS(m->valid == VM_PAGE_BITS_ALL);
} else if (vm_pager_has_page(uobj, idx, NULL, NULL)) {
m = vm_page_alloc(uobj, idx, VM_ALLOC_NORMAL);
Modified: user/attilio/vmobj-readlock/sys/kern/uipc_shm.c
==============================================================================
--- user/attilio/vmobj-readlock/sys/kern/uipc_shm.c Mon May 27 16:16:28 2013 (r251030)
+++ user/attilio/vmobj-readlock/sys/kern/uipc_shm.c Mon May 27 16:23:48 2013 (r251031)
@@ -280,16 +280,9 @@ shm_dotruncate(struct shmfd *shmfd, off_
idx = OFF_TO_IDX(length);
retry:
m = vm_page_lookup(object, idx);
- if (m != NULL) {
- if ((m->oflags & VPO_BUSY) != 0 ||
- m->busy != 0) {
- vm_page_lock(m);
- VM_OBJECT_WUNLOCK(object);
- vm_page_sleep(m, "shmtrc");
- VM_OBJECT_WLOCK(object);
- goto retry;
- }
- } else if (vm_pager_has_page(object, idx, NULL, NULL)) {
+ if (m != NULL && 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);
More information about the svn-src-user
mailing list