summaryrefslogtreecommitdiffstats
path: root/usr.sbin/makefs
diff options
context:
space:
mode:
authornatano <natano@openbsd.org>2016-10-22 10:43:08 +0000
committernatano <natano@openbsd.org>2016-10-22 10:43:08 +0000
commitfd8e8329c11a669e00b04994c23d409affe1db2e (patch)
tree6ef55c30b66c9cbf555ab0aba291cfde46de82d3 /usr.sbin/makefs
parentUse deterministic pseudo-random numbers when the -T flag is used; for (diff)
downloadwireguard-openbsd-fd8e8329c11a669e00b04994c23d409affe1db2e.tar.xz
wireguard-openbsd-fd8e8329c11a669e00b04994c23d409affe1db2e.zip
Remove unused code for 4.3BSD format filesystems.
Diffstat (limited to 'usr.sbin/makefs')
-rw-r--r--usr.sbin/makefs/ffs/mkfs.c19
1 files changed, 7 insertions, 12 deletions
diff --git a/usr.sbin/makefs/ffs/mkfs.c b/usr.sbin/makefs/ffs/mkfs.c
index 8b0bb88a395..766e4da17cb 100644
--- a/usr.sbin/makefs/ffs/mkfs.c
+++ b/usr.sbin/makefs/ffs/mkfs.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mkfs.c,v 1.8 2016/10/22 10:03:52 natano Exp $ */
+/* $OpenBSD: mkfs.c,v 1.9 2016/10/22 10:43:08 natano Exp $ */
/* $NetBSD: mkfs.c,v 1.34 2016/06/24 19:24:11 christos Exp $ */
/*
@@ -136,17 +136,12 @@ ffs_mkfs(const char *fsys, const fsinfo_t *fsopts, time_t tstamp)
strlcpy((char *)sblock.fs_volname, ffs_opts->label,
sizeof(sblock.fs_volname));
- if (Oflag == 0) {
- sblock.fs_old_inodefmt = FS_42INODEFMT;
- sblock.fs_maxsymlinklen = 0;
- sblock.fs_old_flags = 0;
- } else {
- sblock.fs_old_inodefmt = FS_44INODEFMT;
- sblock.fs_maxsymlinklen = (Oflag == 1 ? UFS1_MAXSYMLINKLEN :
- UFS2_MAXSYMLINKLEN);
- sblock.fs_old_flags = FS_FLAGS_UPDATED;
- sblock.fs_flags = 0;
- }
+ sblock.fs_old_inodefmt = FS_44INODEFMT;
+ sblock.fs_maxsymlinklen = (Oflag == 1 ? UFS1_MAXSYMLINKLEN :
+ UFS2_MAXSYMLINKLEN);
+ sblock.fs_old_flags = FS_FLAGS_UPDATED;
+ sblock.fs_flags = 0;
+
/*
* Validate the given file system size.
* Verify that its last block can actually be accessed.