[src/netbsd-2-1]: src/sbin/newfs Pull up following revision(s) (requested by ...

[riz <riz%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/5ba2d022e0d7
branches:  netbsd-2-1
changeset: 564118:5ba2d022e0d7
user:      riz <riz%NetBSD.org@localhost>
date:      Sun Nov 06 00:43:15 2005 +0000

description:
Pull up following revision(s) (requested by chs in ticket #5971):
        sbin/newfs/mkfs.c: revision 1.92
don't set fs_maxsymlinklen and fs_old_inodefmt twice,
we set them correctly the first time.  fixes PR 26995.

diffstat:

 sbin/newfs/mkfs.c |  9 ++-------
 1 files changed, 2 insertions(+), 7 deletions(-)

diffs (37 lines):

diff -r d04c3f223866 -r 5ba2d022e0d7 sbin/newfs/mkfs.c
--- a/sbin/newfs/mkfs.c Sun Nov 06 00:24:20 2005 +0000
+++ b/sbin/newfs/mkfs.c Sun Nov 06 00:43:15 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: mkfs.c,v 1.87.2.1 2004/04/27 17:26:24 jdc Exp $        */
+/*     $NetBSD: mkfs.c,v 1.87.2.1.4.1 2005/11/06 00:43:15 riz Exp $    */
 
 /*
  * Copyright (c) 1980, 1989, 1993
@@ -73,7 +73,7 @@
 #if 0
 static char sccsid[] = "@(#)mkfs.c     8.11 (Berkeley) 5/3/95";
 #else
-__RCSID("$NetBSD: mkfs.c,v 1.87.2.1 2004/04/27 17:26:24 jdc Exp $");
+__RCSID("$NetBSD: mkfs.c,v 1.87.2.1.4.1 2005/11/06 00:43:15 riz Exp $");
 #endif
 #endif /* not lint */
 
@@ -295,9 +295,6 @@
                sblock.fs_sblockloc = SBLOCK_UFS1;
                sblock.fs_nindir = sblock.fs_bsize / sizeof(int32_t);
                sblock.fs_inopb = sblock.fs_bsize / sizeof(struct ufs1_dinode);
-               sblock.fs_maxsymlinklen = ((NDADDR + NIADDR) *
-                   sizeof (int32_t));
-               sblock.fs_old_inodefmt = FS_44INODEFMT;
                sblock.fs_old_cgoffset = 0;
                sblock.fs_old_cgmask = 0xffffffff;
                sblock.fs_old_size = sblock.fs_size;
@@ -315,8 +312,6 @@
                sblock.fs_sblockloc = SBLOCK_UFS2;
                sblock.fs_nindir = sblock.fs_bsize / sizeof(int64_t);
                sblock.fs_inopb = sblock.fs_bsize / sizeof(struct ufs2_dinode);
-               sblock.fs_maxsymlinklen = ((NDADDR + NIADDR) *
-                   sizeof (int64_t));
        }
 
        sblock.fs_sblkno =