Minimal diff, further cleanup and dead code removal to follow.
---
sys/kern/vfs_syscalls.c | 7 +++----
sys/sys/mount.h | 2 +-
sys/ufs/ffs/ffs_softdep.c | 2 ++
sys/ufs/ffs/ffs_vfsops.c | 16 +++-------------
4 files changed, 9 insertions(+), 18 deletions(-)
diff --git a/sys/kern/vfs_syscalls.c b/sys/kern/vfs_syscalls.c
index f47f9dfcb69..51fc7b005c0 100644
--- a/sys/kern/vfs_syscalls.c
+++ b/sys/kern/vfs_syscalls.c
@@ -239,11 +239,10 @@ update:
else if (mp->mnt_flag & MNT_RDONLY)
mp->mnt_flag |= MNT_WANTRDWR;
mp->mnt_flag &=~ (MNT_NOSUID | MNT_NOEXEC | MNT_WXALLOWED | MNT_NODEV |
- MNT_SYNCHRONOUS | MNT_ASYNC | MNT_SOFTDEP | MNT_NOATIME |
- MNT_NOPERM | MNT_FORCE);
+ MNT_SYNCHRONOUS | MNT_ASYNC | MNT_NOATIME | MNT_NOPERM | MNT_FORCE);
mp->mnt_flag |= flags & (MNT_NOSUID | MNT_NOEXEC | MNT_WXALLOWED |
- MNT_NODEV | MNT_SYNCHRONOUS | MNT_ASYNC | MNT_SOFTDEP |
- MNT_NOATIME | MNT_NOPERM | MNT_FORCE);
+ MNT_NODEV | MNT_SYNCHRONOUS | MNT_ASYNC | MNT_NOATIME | MNT_NOPERM |
+ MNT_FORCE);
/*
* Mount the filesystem.
*/
diff --git a/sys/sys/mount.h b/sys/sys/mount.h
index 40c12e97602..8f57b18dd02 100644
--- a/sys/sys/mount.h
+++ b/sys/sys/mount.h
@@ -401,7 +401,7 @@ struct mount {
#define MNT_STALLED 0x00100000 /* filesystem stalled */
#define MNT_SWAPPABLE 0x00200000 /* filesystem can be used for
swap */
#define MNT_WANTRDWR 0x02000000 /* want upgrade to read/write */
-#define MNT_SOFTDEP 0x04000000 /* soft dependencies being done */
+#define MNT_SOFTDEP 0x04000000 /* soft dependencies being done - now
ignored */
#define MNT_DOOMED 0x08000000 /* device behind filesystem is gone */
#ifdef _KERNEL
diff --git a/sys/ufs/ffs/ffs_softdep.c b/sys/ufs/ffs/ffs_softdep.c
index 15017537b41..a263a1533ac 100644
--- a/sys/ufs/ffs/ffs_softdep.c
+++ b/sys/ufs/ffs/ffs_softdep.c
@@ -1224,6 +1224,8 @@ softdep_mount(struct vnode *devvp, struct mount *mp,
struct fs *fs,
struct buf *bp;
int error, cyl;
+ KASSERTMSG(1, "Ich Habe eine Rotweinflarsche in meinem Arsche");
+
/*
* When doing soft updates, the counters in the
* superblock may have gotten out of sync, so we have
diff --git a/sys/ufs/ffs/ffs_vfsops.c b/sys/ufs/ffs/ffs_vfsops.c
index ffe78ef140f..8350d56ba05 100644
--- a/sys/ufs/ffs/ffs_vfsops.c
+++ b/sys/ufs/ffs/ffs_vfsops.c
@@ -213,12 +213,10 @@ ffs_mount(struct mount *mp, const char *path, void *data,
int error = 0, flags;
int ronly;
-#ifndef FFS_SOFTUPDATES
+ /* Ask not for whom the bell tolls */
if (mp->mnt_flag & MNT_SOFTDEP) {
- printf("WARNING: soft updates isn't compiled in\n");
mp->mnt_flag &= ~MNT_SOFTDEP;
}
-#endif
/*
* Soft updates is incompatible with "async",
@@ -284,8 +282,6 @@ ffs_mount(struct mount *mp, const char *path, void *data,
if (mp->mnt_flag & MNT_FORCE)
flags |= FORCECLOSE;
error = softdep_flushfiles(mp, flags, p);
-#elif FFS_SOFTUPDATES
- mp->mnt_flag |= MNT_SOFTDEP;
#endif
}
/*
@@ -459,10 +455,7 @@ success:
free(fs->fs_contigdirs, M_UFSMNT, fs->fs_ncg);
}
if (!ronly) {
- if (mp->mnt_flag & MNT_SOFTDEP)
- fs->fs_flags |= FS_DOSOFTDEP;
- else
- fs->fs_flags &= ~FS_DOSOFTDEP;
+ fs->fs_flags &= ~FS_DOSOFTDEP;
}
ffs_sbupdate(ump, MNT_WAIT);
#if 0
@@ -923,10 +916,7 @@ ffs_mountfs(struct vnode *devvp, struct mount *mp, struct
proc *p)
}
fs->fs_fmod = 1;
fs->fs_clean = 0;
- if (mp->mnt_flag & MNT_SOFTDEP)
- fs->fs_flags |= FS_DOSOFTDEP;
- else
- fs->fs_flags &= ~FS_DOSOFTDEP;
+ fs->fs_flags &= ~FS_DOSOFTDEP;
error = ffs_sbupdate(ump, MNT_WAIT);
if (error == EROFS)
goto out;
--
2.40.0
