summaryrefslogtreecommitdiffstats
path: root/sys/kern/vfs_bio.c
diff options
context:
space:
mode:
authoralc <alc@FreeBSD.org>2003-04-19 21:15:44 +0000
committeralc <alc@FreeBSD.org>2003-04-19 21:15:44 +0000
commitef4e8a19cfc9fb054dbda2b5efdaef60ef82438c (patch)
tree1252eafc53a186512ad8520018edf2e4e5639731 /sys/kern/vfs_bio.c
parentd558a7a53b5bf20f012c13da1c784b62854e09b1 (diff)
downloadFreeBSD-src-ef4e8a19cfc9fb054dbda2b5efdaef60ef82438c.zip
FreeBSD-src-ef4e8a19cfc9fb054dbda2b5efdaef60ef82438c.tar.gz
- Lock the vm_object when performing vm_object_pip_wakeupn().
- Assert that the vm_object lock is held in vm_object_pip_wakeupn(). - Add a new macro VM_OBJECT_LOCK_ASSERT().
Diffstat (limited to 'sys/kern/vfs_bio.c')
-rw-r--r--sys/kern/vfs_bio.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/sys/kern/vfs_bio.c b/sys/kern/vfs_bio.c
index 6893c8a..4125781 100644
--- a/sys/kern/vfs_bio.c
+++ b/sys/kern/vfs_bio.c
@@ -3193,8 +3193,11 @@ bufdone(struct buf *bp)
iosize -= resid;
}
vm_page_unlock_queues();
- if (obj)
+ if (obj != NULL) {
+ VM_OBJECT_LOCK(obj);
vm_object_pip_wakeupn(obj, 0);
+ VM_OBJECT_UNLOCK(obj);
+ }
}
/*
@@ -3231,6 +3234,7 @@ vfs_unbusy_pages(struct buf * bp)
vm_object_t obj;
obj = bp->b_object;
+ VM_OBJECT_LOCK(obj);
vm_page_lock_queues();
for (i = 0; i < bp->b_npages; i++) {
vm_page_t m = bp->b_pages[i];
@@ -3249,6 +3253,7 @@ vfs_unbusy_pages(struct buf * bp)
}
vm_page_unlock_queues();
vm_object_pip_wakeupn(obj, 0);
+ VM_OBJECT_UNLOCK(obj);
}
}
OpenPOWER on IntegriCloud