mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2025-02-04 17:15:50 +00:00
Code Issues Releases Activity

Fixed bitrot in the non-softdep case of ufs_dirremove():

Browse Source 
- restored async mount support.  The first entry in a block is still
  always written synchronously, although it probably shouldn't be in
  the async case.
- restored use of BWRITE() instead of bowrite() for the DOWHITEOUT
  case, although bowrite() is probably better.

Broken by:	merge of softdep changes (rev.1.22).
Found by:	lmbench2 delete-file benchmarks.
This commit is contained in:
Bruce Evans 1998-04-15 12:27:31 +00:00
parent dcfe005838
commit 37223939f0
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=35205
1 changed files with 9 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
sys/ufs/ufs/ufs_lookup.c
View File

@ -36,7 +36,7 @@
* SUCH DAMAGE.
*
* @(#)ufs_lookup.c 8.15 (Berkeley) 6/16/95
* $Id: ufs_lookup.c,v 1.22 1998/03/08 09:59:29 julian Exp $
* $Id: ufs_lookup.c,v 1.23 1998/03/30 09:56:23 phk Exp $
*/
#include <sys/param.h>
@ -878,12 +878,6 @@ ufs_dirremove(dvp, ip, flags, isrmdir)
/*
* First entry in block: set d_ino to zero.
*/
#if 0
error =
UFS_BLKATOFF(dvp, (off_t)dp->i_offset, (char **)&ep, &bp);
if (error)
return (error);
#endif
ep->d_ino = 0;
} else {
/*
@ -903,24 +897,15 @@ out:
} else {
if (ip)
ip->i_nlink--;
error = bowrite(bp); /* maybe this should be as below? */
if (flags & DOWHITEOUT)
error = VOP_BWRITE(bp);
else if (dvp->v_mount->mnt_flag & MNT_ASYNC
&& dp->i_count != 0) {
bdwrite(bp);
error = 0;
} else
error = bowrite(bp);
}
#if 0
/*
* Collapse new free space into previous entry.
*/
error = UFS_BLKATOFF(dvp, (off_t)(dp->i_offset - dp->i_count),
(char **)&ep, &bp);
if (error)
return (error);
ep->d_reclen += dp->i_reclen;
if (dvp->v_mount->mnt_flag & MNT_ASYNC) {
bdwrite(bp);
error = 0;
} else {
error = bowrite(bp);
}
#endif
dp->i_flag |= IN_CHANGE | IN_UPDATE;
return (error);
}