diff --git a/sys/ufs/ufs/ufs_lookup.c b/sys/ufs/ufs/ufs_lookup.c index a07a14c6e42c..35d55056b446 100644 --- a/sys/ufs/ufs/ufs_lookup.c +++ b/sys/ufs/ufs/ufs_lookup.c @@ -1,4 +1,4 @@ -/* $NetBSD: ufs_lookup.c,v 1.54 2003/11/08 06:36:13 dbj Exp $ */ +/* $NetBSD: ufs_lookup.c,v 1.55 2004/03/06 06:54:12 yamt Exp $ */ /* * Copyright (c) 1989, 1993 @@ -37,7 +37,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: ufs_lookup.c,v 1.54 2003/11/08 06:36:13 dbj Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ufs_lookup.c,v 1.55 2004/03/06 06:54:12 yamt Exp $"); #include #include @@ -763,7 +763,7 @@ ufs_direnter(dvp, tvp, dirp, cnp, newdirbp) if (dp->i_offset & (dirblksiz - 1)) panic("ufs_direnter: newblk"); flags = B_CLRBUF; - if (!DOINGSOFTDEP(dvp) && !(dvp->v_mount->mnt_flag &MNT_ASYNC)) + if (!DOINGSOFTDEP(dvp)) flags |= B_SYNC; if ((error = VOP_BALLOC(dvp, (off_t)dp->i_offset, dirblksiz, cr, flags, &bp)) != 0) { @@ -831,11 +831,7 @@ ufs_direnter(dvp, tvp, dirp, cnp, newdirbp) vn_lock(tvp, LK_EXCLUSIVE | LK_RETRY); return (error); } else { - if (dvp->v_mount->mnt_flag & MNT_ASYNC) { - bdwrite(bp); - error = 0; - } else - error = VOP_BWRITE(bp); + error = VOP_BWRITE(bp); } TIMEVAL_TO_TIMESPEC(&time, &ts); ret = VOP_UPDATE(dvp, &ts, &ts, UPDATE_DIROP); @@ -939,11 +935,7 @@ ufs_direnter(dvp, tvp, dirp, cnp, newdirbp) ufs_rw32(dirp->d_ino, needswap), newdirbp, 0); bdwrite(bp); } else { - if (dvp->v_mount->mnt_flag & MNT_ASYNC) { - bdwrite(bp); - error = 0; - } else - error = VOP_BWRITE(bp); + error = VOP_BWRITE(bp); } dp->i_flag |= IN_CHANGE | IN_UPDATE; /* @@ -1037,11 +1029,7 @@ out: DIP_ASSIGN(ip, nlink, ip->i_nlink); ip->i_flag |= IN_CHANGE; } - if (dvp->v_mount->mnt_flag & MNT_ASYNC) { - bdwrite(bp); - error = 0; - } else - error = VOP_BWRITE(bp); + error = VOP_BWRITE(bp); } dp->i_flag |= IN_CHANGE | IN_UPDATE; return (error); @@ -1080,11 +1068,7 @@ ufs_dirrewrite(dp, oip, newinum, newtype, isrmdir, iflags) oip->i_nlink--; DIP_ASSIGN(oip, nlink, oip->i_nlink); oip->i_flag |= IN_CHANGE; - if (vdp->v_mount->mnt_flag & MNT_ASYNC) { - bdwrite(bp); - error = 0; - } else - error = VOP_BWRITE(bp); + error = VOP_BWRITE(bp); } dp->i_flag |= iflags; return (error);