diff options
| author | dyson <dyson@FreeBSD.org> | 1997-08-26 04:36:27 +0000 |
|---|---|---|
| committer | dyson <dyson@FreeBSD.org> | 1997-08-26 04:36:27 +0000 |
| commit | b90433b1a924022c19ceee85ec65827dc47bc039 (patch) | |
| tree | bdc95eb0fcbd9232b05d0c7f981fdfab0c4f98cb /sys/ufs | |
| parent | c86802a2aefedc8e4193d369616e502bb635d002 (diff) | |
| download | FreeBSD-src-b90433b1a924022c19ceee85ec65827dc47bc039.zip FreeBSD-src-b90433b1a924022c19ceee85ec65827dc47bc039.tar.gz | |
Back out some incorrect changes that was worse than the original bug.
Diffstat (limited to 'sys/ufs')
| -rw-r--r-- | sys/ufs/ufs/ufs_inode.c | 4 | ||||
| -rw-r--r-- | sys/ufs/ufs/ufs_vnops.c | 10 |
2 files changed, 3 insertions, 11 deletions
diff --git a/sys/ufs/ufs/ufs_inode.c b/sys/ufs/ufs/ufs_inode.c index 29b5dff..c3166ad 100644 --- a/sys/ufs/ufs/ufs_inode.c +++ b/sys/ufs/ufs/ufs_inode.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)ufs_inode.c 8.9 (Berkeley) 5/14/95 - * $Id: ufs_inode.c,v 1.12 1997/03/22 06:53:44 bde Exp $ + * $Id: ufs_inode.c,v 1.13 1997/08/22 03:56:35 dyson Exp $ */ #include "opt_quota.h" @@ -104,7 +104,7 @@ out: * so that it can be reused immediately. */ if (ip->i_mode == 0) - vp->v_flag |= VAGE; + vrecycle(vp, (struct simplelock *)0, p); return (error); } diff --git a/sys/ufs/ufs/ufs_vnops.c b/sys/ufs/ufs/ufs_vnops.c index 3f9d72c..fc60e85 100644 --- a/sys/ufs/ufs/ufs_vnops.c +++ b/sys/ufs/ufs/ufs_vnops.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)ufs_vnops.c 8.27 (Berkeley) 5/27/95 - * $Id: ufs_vnops.c,v 1.53 1997/08/21 01:42:47 dyson Exp $ + * $Id: ufs_vnops.c,v 1.54 1997/08/22 15:37:23 dyson Exp $ */ #include "opt_quota.h" @@ -692,14 +692,6 @@ ufs_remove(ap) ip->i_flag |= IN_CHANGE; } out: -#if 0 - if ((ip->i_nlink == 0) && - ((vp->v_object == NULL) && (vp->v_usecount == 1)) || - (vp->v_usecount <= 2)) { - VOP_TRUNCATE(vp, (off_t)0, 0, NOCRED, NULL); - } -#endif - if (dvp == vp) vrele(vp); else |
