summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTor Egge <tegge@FreeBSD.org>2006-05-09 22:33:43 +0000
committerTor Egge <tegge@FreeBSD.org>2006-05-09 22:33:43 +0000
commit4613aa0e99e44143c904f0bb0058cbc130a914e9 (patch)
tree425ce8264d67e9329f1accfa299c93fd41bc9ae4
parent32397ce071bdd5e4185220f3715694351f860d91 (diff)
Notes
-rw-r--r--sys/ufs/ufs/ufs_inode.c10
1 files changed, 7 insertions, 3 deletions
diff --git a/sys/ufs/ufs/ufs_inode.c b/sys/ufs/ufs/ufs_inode.c
index b85c9a3f816a..638e23b95a68 100644
--- a/sys/ufs/ufs/ufs_inode.c
+++ b/sys/ufs/ufs/ufs_inode.c
@@ -83,9 +83,9 @@ ufs_inactive(ap)
*/
if (ip->i_mode == 0)
goto out;
- if (ip->i_effnlink == 0 && DOINGSOFTDEP(vp))
- softdep_releasefile(ip);
- if (ip->i_nlink <= 0 && (vp->v_mount->mnt_flag & MNT_RDONLY) == 0) {
+ if ((ip->i_effnlink == 0 && DOINGSOFTDEP(vp)) ||
+ (ip->i_nlink <= 0 &&
+ (vp->v_mount->mnt_flag & MNT_RDONLY) == 0)) {
loop:
if (vn_start_secondary_write(vp, &mp, V_NOWAIT) != 0) {
/* Cannot delete file while file system is suspended */
@@ -112,6 +112,10 @@ ufs_inactive(ap)
return (0);
}
}
+ }
+ if (ip->i_effnlink == 0 && DOINGSOFTDEP(vp))
+ softdep_releasefile(ip);
+ if (ip->i_nlink <= 0 && (vp->v_mount->mnt_flag & MNT_RDONLY) == 0) {
#ifdef QUOTA
if (!getinoquota(ip))
(void)chkiq(ip, -1, NOCRED, FORCE);