diff options
| author | kib <kib@FreeBSD.org> | 2016-07-25 13:28:59 +0000 |
|---|---|---|
| committer | kib <kib@FreeBSD.org> | 2016-07-25 13:28:59 +0000 |
| commit | 545d990a81b5df5354712165e83217404a6eb3c2 (patch) | |
| tree | 9319d12f2f616c0e1d24a8b6d3996d97678ee36a /sys/kern/vfs_subr.c | |
| parent | 89a28f810e01c9f7088dc3c4f7a2006e60e6dc18 (diff) | |
| download | FreeBSD-src-545d990a81b5df5354712165e83217404a6eb3c2.zip FreeBSD-src-545d990a81b5df5354712165e83217404a6eb3c2.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.
Approved by: re (gjb)
Diffstat (limited to 'sys/kern/vfs_subr.c')
| -rw-r--r-- | sys/kern/vfs_subr.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c index 5b4c8a7..0b73d14 100644 --- a/sys/kern/vfs_subr.c +++ b/sys/kern/vfs_subr.c @@ -3232,7 +3232,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); /* |
