diff options
| author | Pedro Martelletto <pedro@cvs.openbsd.org> | 2007-06-06 09:53:17 +0000 |
|---|---|---|
| committer | Pedro Martelletto <pedro@cvs.openbsd.org> | 2007-06-06 09:53:17 +0000 |
| commit | 043ddf5455ca568b713f247107c8c0845e32fdd0 (patch) | |
| tree | a038d03de2c143f2ec253ec9d620389c80a00ce3 /sys | |
| parent | 30806cfec71313a5e37376f914e8772cfaf51704 (diff) | |
Don't promote MNT_WAIT to MNT_NOWAIT when syncing the device vnode of a
mounted softdep file system, okay mickey@ beck@ art@
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/ufs/ffs/ffs_vfsops.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/sys/ufs/ffs/ffs_vfsops.c b/sys/ufs/ffs/ffs_vfsops.c index daaee190f0a..022f0273d69 100644 --- a/sys/ufs/ffs/ffs_vfsops.c +++ b/sys/ufs/ffs/ffs_vfsops.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ffs_vfsops.c,v 1.107 2007/06/01 06:38:54 deraadt Exp $ */ +/* $OpenBSD: ffs_vfsops.c,v 1.108 2007/06/06 09:53:16 pedro Exp $ */ /* $NetBSD: ffs_vfsops.c,v 1.19 1996/02/09 22:22:26 christos Exp $ */ /* @@ -1208,8 +1208,6 @@ ffs_sync(struct mount *mp, int waitfor, struct ucred *cred, struct proc *p) goto loop; } if (waitfor != MNT_LAZY) { - if (ump->um_mountp->mnt_flag & MNT_SOFTDEP) - waitfor = MNT_NOWAIT; vn_lock(ump->um_devvp, LK_EXCLUSIVE | LK_RETRY, p); if ((error = VOP_FSYNC(ump->um_devvp, cred, waitfor, p)) != 0) allerror = error; |