diff options
author | Todd C. Miller <millert@cvs.openbsd.org> | 2007-04-17 14:24:15 +0000 |
---|---|---|
committer | Todd C. Miller <millert@cvs.openbsd.org> | 2007-04-17 14:24:15 +0000 |
commit | 0731e6b60f9aad8995c16d684e6bac382e97399a (patch) | |
tree | e8d704dcdc5e9b25eb065d6081ef75d6d1513c16 /sbin | |
parent | 9e1288bfeb8c537fd91d13485b48916cb61cbcc0 (diff) |
Fix merge error; fs_inodefmt was not being set for the ffs2 case
Diffstat (limited to 'sbin')
-rw-r--r-- | sbin/newfs/mkfs.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sbin/newfs/mkfs.c b/sbin/newfs/mkfs.c index 58534d058f4..32acd5daada 100644 --- a/sbin/newfs/mkfs.c +++ b/sbin/newfs/mkfs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mkfs.c,v 1.55 2007/04/13 17:33:02 millert Exp $ */ +/* $OpenBSD: mkfs.c,v 1.56 2007/04/17 14:24:14 millert Exp $ */ /* $NetBSD: mkfs.c,v 1.25 1995/06/18 21:35:38 cgd Exp $ */ /* @@ -282,6 +282,7 @@ mkfs(struct partition *pp, char *fsys, int fi, int fo, mode_t mfsmode, sblock.fs_trackskew = 0; sblock.fs_cpc = 0; } else { + sblock.fs_inodefmt = FS_44INODEFMT; sblock.fs_sblockloc = SBLOCK_UFS2; sblock.fs_nindir = sblock.fs_bsize / sizeof(ufs2_daddr_t); sblock.fs_inopb = sblock.fs_bsize / sizeof(struct ufs2_dinode); |