diff options
| author | Renato Botelho <renato@netgate.com> | 2016-11-02 10:47:46 -0200 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2016-11-02 10:47:46 -0200 |
| commit | 01e4dee209c13f5a3343e3cc887c2f920a69dd65 (patch) | |
| tree | b19966b3c263495a3f07f891adba668c508ba31b /sys/kern | |
| parent | 5fc1b195c4ab71aaf651429b2c50ee5cc5e7c5fb (diff) | |
| parent | 2f81d935658287026e614a5edf74ae47f5c54f3f (diff) | |
| download | FreeBSD-src-RELENG_2_3_2.zip FreeBSD-src-RELENG_2_3_2.tar.gz | |
Merge remote-tracking branch 'origin/releng/10.3' into RELENG_2_3_2RELENG_2_3_2
Diffstat (limited to 'sys/kern')
| -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 aa81313..85af62e 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); /* |
