diff options
| author | kib <kib@FreeBSD.org> | 2016-07-25 13:31:18 +0000 |
|---|---|---|
| committer | kib <kib@FreeBSD.org> | 2016-07-25 13:31:18 +0000 |
| commit | f8b6f802317642bef0e5d4c5b5e8345ae346c944 (patch) | |
| tree | b1c6c9cca8c001cd4f6267922296443666738928 | |
| parent | 6a0290c37b0dcef2667c24f3b193eae8759bd768 (diff) | |
| download | FreeBSD-src-f8b6f802317642bef0e5d4c5b5e8345ae346c944.zip FreeBSD-src-f8b6f802317642bef0e5d4c5b5e8345ae346c944.tar.gz | |
MFC r302567:
In vgonel(), postpone setting BO_DEAD until VOP_RECLAIM() is called,
if vnode is VMIO. For VMIO vnodes, set BO_DEAD in vm_object_terminate().
MFC r302580:
Fix grammar.
| -rw-r--r-- | sys/kern/vfs_subr.c | 8 | ||||
| -rw-r--r-- | sys/vm/vm_object.c | 4 |
2 files changed, 11 insertions, 1 deletions
diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c index e0e7205..5c48b81 100644 --- a/sys/kern/vfs_subr.c +++ b/sys/kern/vfs_subr.c @@ -2934,7 +2934,13 @@ vgonel(struct vnode *vp) TAILQ_EMPTY(&vp->v_bufobj.bo_clean.bv_hd) && vp->v_bufobj.bo_clean.bv_cnt == 0, ("vp %p bufobj not invalidated", vp)); - vp->v_bufobj.bo_flag |= BO_DEAD; + + /* + * For VMIO bufobj, BO_DEAD is set in vm_object_terminate() + * after the object's page queue is flushed. + */ + if (vp->v_bufobj.bo_object == NULL) + vp->v_bufobj.bo_flag |= BO_DEAD; BO_UNLOCK(&vp->v_bufobj); /* diff --git a/sys/vm/vm_object.c b/sys/vm/vm_object.c index 5ea59b3..b2a7013 100644 --- a/sys/vm/vm_object.c +++ b/sys/vm/vm_object.c @@ -737,6 +737,10 @@ vm_object_terminate(vm_object_t object) vinvalbuf(vp, V_SAVE, 0, 0); + BO_LOCK(&vp->v_bufobj); + vp->v_bufobj.bo_flag |= BO_DEAD; + BO_UNLOCK(&vp->v_bufobj); + VM_OBJECT_WLOCK(object); } |
