aboutsummaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
Diffstat (limited to 'sys')
-rw-r--r--sys/ufs/ffs/ffs_softdep.c9
-rw-r--r--sys/ufs/ufs/ufs_inode.c2
2 files changed, 5 insertions, 6 deletions
diff --git a/sys/ufs/ffs/ffs_softdep.c b/sys/ufs/ffs/ffs_softdep.c
index 3cc76f9142c3..8c3ae9dd95fc 100644
--- a/sys/ufs/ffs/ffs_softdep.c
+++ b/sys/ufs/ffs/ffs_softdep.c
@@ -1493,13 +1493,14 @@ get_parent_vp(struct vnode *vp, struct mount *mp, ino_t inum, struct buf *bp,
}
/*
- * Do not drop vnode lock while inactivating. This
- * would result in leaks of the VI flags and
- * reclaiming of non-truncated vnode. Instead,
+ * Do not drop vnode lock while inactivating during
+ * vunref. This would result in leaks of the VI flags
+ * and reclaiming of non-truncated vnode. Instead,
* re-schedule inactivation hoping that we would be
* able to sync inode later.
*/
- if ((vp->v_iflag & VI_DOINGINACT) != 0) {
+ if ((vp->v_iflag & VI_DOINGINACT) != 0 &&
+ (vp->v_vflag & VV_UNREF) != 0) {
VI_LOCK(vp);
vp->v_iflag |= VI_OWEINACT;
VI_UNLOCK(vp);
diff --git a/sys/ufs/ufs/ufs_inode.c b/sys/ufs/ufs/ufs_inode.c
index 15bd8be448a9..46e4f8e54e41 100644
--- a/sys/ufs/ufs/ufs_inode.c
+++ b/sys/ufs/ufs/ufs_inode.c
@@ -212,8 +212,6 @@ out:
vrecycle(vp);
if (mp != NULL)
vn_finished_secondary_write(mp);
- if (error == ERELOOKUP)
- error = 0;
return (error);
}