diff options
| author | kib <kib@FreeBSD.org> | 2013-12-13 06:12:21 +0000 |
|---|---|---|
| committer | kib <kib@FreeBSD.org> | 2013-12-13 06:12:21 +0000 |
| commit | f79abc87dfd55da722eea937fd93b88fa6ea0212 (patch) | |
| tree | 70a2d57623facdfd24c0a1a5f98ac19142bd1e19 /sys/vm/vm_pageout.c | |
| parent | b642c1ba2269a5ab1b9506fb3e26323b939172ae (diff) | |
| download | FreeBSD-src-f79abc87dfd55da722eea937fd93b88fa6ea0212.zip FreeBSD-src-f79abc87dfd55da722eea937fd93b88fa6ea0212.tar.gz | |
MFC r257899:
If filesystem declares that it supports shared locking for writes, use
shared vnode lock for VOP_PUTPAGES() as well.
Diffstat (limited to 'sys/vm/vm_pageout.c')
| -rw-r--r-- | sys/vm/vm_pageout.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/sys/vm/vm_pageout.c b/sys/vm/vm_pageout.c index 5660b56..e743640 100644 --- a/sys/vm/vm_pageout.c +++ b/sys/vm/vm_pageout.c @@ -570,6 +570,7 @@ vm_pageout_launder(struct vm_pagequeue *pq, int tries, vm_paddr_t low, vm_object_t object; vm_paddr_t pa; vm_page_t m, m_tmp, next; + int lockmode; vm_pagequeue_lock(pq); TAILQ_FOREACH_SAFE(m, &pq->pq_pl, plinks.q, next) { @@ -605,7 +606,9 @@ vm_pageout_launder(struct vm_pagequeue *pq, int tries, vm_paddr_t low, vm_object_reference_locked(object); VM_OBJECT_WUNLOCK(object); (void)vn_start_write(vp, &mp, V_WAIT); - vn_lock(vp, LK_EXCLUSIVE | LK_RETRY); + lockmode = MNT_SHARED_WRITES(vp->v_mount) ? + LK_SHARED : LK_EXCLUSIVE; + vn_lock(vp, lockmode | LK_RETRY); VM_OBJECT_WLOCK(object); vm_object_page_clean(object, 0, 0, OBJPC_SYNC); VM_OBJECT_WUNLOCK(object); @@ -902,6 +905,7 @@ vm_pageout_scan(struct vm_domain *vmd, int pass) int act_delta; int vnodes_skipped = 0; int maxlaunder; + int lockmode; boolean_t queues_locked; /* @@ -1193,7 +1197,9 @@ vm_pageout_scan(struct vm_domain *vmd, int pass) ("vp %p with NULL v_mount", vp)); vm_object_reference_locked(object); VM_OBJECT_WUNLOCK(object); - if (vget(vp, LK_EXCLUSIVE | LK_TIMELOCK, + lockmode = MNT_SHARED_WRITES(vp->v_mount) ? + LK_SHARED : LK_EXCLUSIVE; + if (vget(vp, lockmode | LK_TIMELOCK, curthread)) { VM_OBJECT_WLOCK(object); ++pageout_lock_miss; |
