diff options
| author | Kenneth R Westerback <krw@cvs.openbsd.org> | 2024-07-10 09:20:34 +0000 |
|---|---|---|
| committer | Kenneth R Westerback <krw@cvs.openbsd.org> | 2024-07-10 09:20:34 +0000 |
| commit | aa4d8b560a078e40ce2a2cb0f1570de42e458230 (patch) | |
| tree | 51fad129a1bc4794d7528300d2549993dbf2f3e4 | |
| parent | ec2503fa863a7a720ec72fd0b7d62da74dc32417 (diff) | |
Sweep up more softdep crumbs.
FFS_SOFTUPDATES is no longer used. Remove stray defined(FFS_SOFTUPDATES) checks
and an #if/#endif block referencing no longer defined softdep_fsync().
ok otto@
| -rw-r--r-- | regress/usr.bin/diff/t8.2 | 6 | ||||
| -rw-r--r-- | regress/usr.bin/diff/t9.2 | 6 |
2 files changed, 4 insertions, 8 deletions
diff --git a/regress/usr.bin/diff/t8.2 b/regress/usr.bin/diff/t8.2 index f84ad5c3480..f060fd1a5c0 100644 --- a/regress/usr.bin/diff/t8.2 +++ b/regress/usr.bin/diff/t8.2 @@ -1,4 +1,4 @@ -/* $OpenBSD: t8.2,v 1.1 2003/07/17 21:04:04 otto Exp $ */ +/* $OpenBSD: t8.2,v 1.2 2024/07/10 09:20:33 krw Exp $ */ /* $NetBSD: kern_malloc.c,v 1.15.4.2 1996/06/13 17:10:56 cgd Exp $ */ /* @@ -76,7 +76,7 @@ struct kmemusage *kmemusage; char *kmembase, *kmemlimit; char buckstring[16 * sizeof("123456,")]; int buckstring_init = 0; -#if defined(KMEMSTATS) || defined(DIAGNOSTIC) || defined(FFS_SOFTUPDATES) +#if defined(KMEMSTATS) || defined(DIAGNOSTIC) char *memname[] = INITKMEMNAMES; char *memall = NULL; extern struct lock sysctl_kmemlock; @@ -561,7 +561,7 @@ sysctl_malloc(name, namelen, oldp, oldlenp, newp, newlen, p) return (EOPNOTSUPP); #endif case KERN_MALLOC_KMEMNAMES: -#if defined(KMEMSTATS) || defined(DIAGNOSTIC) || defined(FFS_SOFTUPDATES) +#if defined(KMEMSTATS) || defined(DIAGNOSTIC) if (memall == NULL) { int totlen; diff --git a/regress/usr.bin/diff/t9.2 b/regress/usr.bin/diff/t9.2 index 0a2273c4f02..7b0918cd1b8 100644 --- a/regress/usr.bin/diff/t9.2 +++ b/regress/usr.bin/diff/t9.2 @@ -1,4 +1,4 @@ -/* $OpenBSD: t9.2,v 1.2 2013/12/01 16:40:56 krw Exp $ */ +/* $OpenBSD: t9.2,v 1.3 2024/07/10 09:20:33 krw Exp $ */ /* $NetBSD: vfs_syscalls.c,v 1.71 1996/04/23 10:29:02 mycroft Exp $ */ /* @@ -2292,10 +2292,6 @@ sys_fsync(p, v, retval) vp = (struct vnode *)fp->f_data; vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, p); error = VOP_FSYNC(vp, fp->f_cred, MNT_WAIT, p); -#ifdef FFS_SOFTUPDATES - if (error == 0 && vp->v_mount && (vp->v_mount->mnt_flag & MNT_SOFTDEP)) - error = softdep_fsync(vp); -#endif VOP_UNLOCK(vp, 0, p); FRELE(fp); |