diff options
author | alc <alc@FreeBSD.org> | 2003-06-19 03:38:05 +0000 |
---|---|---|
committer | alc <alc@FreeBSD.org> | 2003-06-19 03:38:05 +0000 |
commit | 12db87194bbf4d8293c519272585ef493706f32e (patch) | |
tree | b026e599c582db304008002a3b964142a282a9c5 /sys/fs | |
parent | 4ebb4520c2b24651069fe247c1f01e54a42b7337 (diff) | |
download | FreeBSD-src-12db87194bbf4d8293c519272585ef493706f32e.zip FreeBSD-src-12db87194bbf4d8293c519272585ef493706f32e.tar.gz |
Lock the vm object when freeing a vm page.
Diffstat (limited to 'sys/fs')
-rw-r--r-- | sys/fs/smbfs/smbfs_io.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/sys/fs/smbfs/smbfs_io.c b/sys/fs/smbfs/smbfs_io.c index 80efbf8..fb56649 100644 --- a/sys/fs/smbfs/smbfs_io.c +++ b/sys/fs/smbfs/smbfs_io.c @@ -428,10 +428,11 @@ smbfs_getpages(ap) struct smbmount *smp; struct smbnode *np; struct smb_cred scred; + vm_object_t object; vm_page_t *pages, m; vp = ap->a_vp; - if (vp->v_object == NULL) { + if ((object = vp->v_object) == NULL) { printf("smbfs_getpages: called with non-merged cache vnode??\n"); return VM_PAGER_ERROR; } @@ -455,12 +456,14 @@ smbfs_getpages(ap) if (m->valid != 0) { /* handled by vm_fault now */ /* vm_page_zero_invalid(m, TRUE); */ + VM_OBJECT_LOCK(object); vm_page_lock_queues(); for (i = 0; i < npages; ++i) { if (i != reqpage) vm_page_free(pages[i]); } vm_page_unlock_queues(); + VM_OBJECT_UNLOCK(object); return 0; } @@ -488,6 +491,8 @@ smbfs_getpages(ap) relpbuf(bp, &smbfs_pbuf_freecnt); + if (error) + VM_OBJECT_LOCK(object); if (error && (uio.uio_resid == count)) { printf("smbfs_getpages: error %d\n",error); vm_page_lock_queues(); @@ -496,6 +501,7 @@ smbfs_getpages(ap) vm_page_free(pages[i]); } vm_page_unlock_queues(); + VM_OBJECT_UNLOCK(object); return VM_PAGER_ERROR; } @@ -557,6 +563,8 @@ smbfs_getpages(ap) } } vm_page_unlock_queues(); + if (error) + VM_OBJECT_UNLOCK(object); return 0; #endif /* SMBFS_RWGENERIC */ } |