Add and use a few more constants and macros needed by UFS2

No functional change

6 files changed, 21 insertions, 20 deletions

diff --git a/sbin/fsck_ffs/pass1.c b/sbin/fsck_ffs/pass1.c
index 1c00810d712..f2ae3eca02b 100644
--- a/sbin/fsck_ffs/pass1.c
+++ b/sbin/fsck_ffs/pass1.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pass1.c,v 1.17 2005/04/16 18:15:41 millert Exp $	*/
+/*	$OpenBSD: pass1.c,v 1.18 2005/12/19 15:18:01 pedro Exp $	*/
 /*	$NetBSD: pass1.c,v 1.16 1996/09/27 22:45:15 christos Exp $	*/
 
 /*
@@ -34,7 +34,7 @@
 #if 0
 static char sccsid[] = "@(#)pass1.c	8.1 (Berkeley) 6/5/93";
 #else
-static const char rcsid[] = "$OpenBSD: pass1.c,v 1.17 2005/04/16 18:15:41 millert Exp $";
+static const char rcsid[] = "$OpenBSD: pass1.c,v 1.18 2005/12/19 15:18:01 pedro Exp $";
 #endif
 #endif /* not lint */
 
@@ -167,7 +167,7 @@ checkinode(ino_t inumber, struct inodesc *idesc)
 		 * conversion altogether.  - mycroft, 19MAY1994
 		 */
 		if (doinglevel2 &&
-		    dp->di_size > 0 && dp->di_size < MAXSYMLINKLEN &&
+		    dp->di_size > 0 && dp->di_size < MAXSYMLINKLEN_UFS1 &&
 		    dp->di_blocks != 0) {
 			symbuf = alloca(secsize);
 			if (bread(fsreadfd, symbuf,
diff --git a/sbin/fsck_ffs/setup.c b/sbin/fsck_ffs/setup.c
index 7857a591299..2c6e0a75952 100644
--- a/sbin/fsck_ffs/setup.c
+++ b/sbin/fsck_ffs/setup.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: setup.c,v 1.21 2003/09/25 04:19:39 deraadt Exp $	*/
+/*	$OpenBSD: setup.c,v 1.22 2005/12/19 15:18:01 pedro Exp $	*/
 /*	$NetBSD: setup.c,v 1.27 1996/09/27 22:45:19 christos Exp $	*/
 
 /*
@@ -34,7 +34,7 @@
 #if 0
 static char sccsid[] = "@(#)setup.c	8.5 (Berkeley) 11/23/94";
 #else
-static const char rcsid[] = "$OpenBSD: setup.c,v 1.21 2003/09/25 04:19:39 deraadt Exp $";
+static const char rcsid[] = "$OpenBSD: setup.c,v 1.22 2005/12/19 15:18:01 pedro Exp $";
 #endif
 #endif /* not lint */
 
@@ -241,10 +241,10 @@ setup(char *dev)
 				dirty(&asblk);
 			}
 		}
-		if (sblock.fs_maxsymlinklen != MAXSYMLINKLEN) {
+		if (sblock.fs_maxsymlinklen != MAXSYMLINKLEN_UFS1) {
 			pwarn("INCORRECT MAXSYMLINKLEN=%d IN SUPERBLOCK",
 				sblock.fs_maxsymlinklen);
-			sblock.fs_maxsymlinklen = MAXSYMLINKLEN;
+			sblock.fs_maxsymlinklen = MAXSYMLINKLEN_UFS1;
 			if (preen)
 				printf(" (FIXED)\n");
 			if (preen || reply("FIX") == 1) {
@@ -291,7 +291,7 @@ setup(char *dev)
 		doinglevel2++;
 		sblock.fs_inodefmt = FS_44INODEFMT;
 		sblock.fs_maxfilesize = maxfilesize;
-		sblock.fs_maxsymlinklen = MAXSYMLINKLEN;
+		sblock.fs_maxsymlinklen = MAXSYMLINKLEN_UFS1;
 		sblock.fs_qbmask = ~sblock.fs_bmask;
 		sblock.fs_qfmask = ~sblock.fs_fmask;
 		sbdirty();
diff --git a/sbin/fsdb/fsdbutil.c b/sbin/fsdb/fsdbutil.c
index f00bf4d6409..7db4aae82f1 100644
--- a/sbin/fsdb/fsdbutil.c
+++ b/sbin/fsdb/fsdbutil.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fsdbutil.c,v 1.10 2003/08/25 23:28:15 tedu Exp $	*/
+/*	$OpenBSD: fsdbutil.c,v 1.11 2005/12/19 15:18:01 pedro Exp $	*/
 /*	$NetBSD: fsdbutil.c,v 1.5 1996/09/28 19:30:37 christos Exp $	*/
 
 /*-
@@ -38,7 +38,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$OpenBSD: fsdbutil.c,v 1.10 2003/08/25 23:28:15 tedu Exp $";
+static char rcsid[] = "$OpenBSD: fsdbutil.c,v 1.11 2005/12/19 15:18:01 pedro Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
@@ -119,7 +119,7 @@ printstat(const char *cp, ino_t inum, struct ufs1_dinode *dp)
 		break;
 	case IFLNK:
 		fputs("symlink",stdout);
-		if (dp->di_size > 0 && dp->di_size < MAXSYMLINKLEN &&
+		if (dp->di_size > 0 && dp->di_size < MAXSYMLINKLEN_UFS1 &&
 		    dp->di_blocks == 0)
 			printf(" to `%.*s'\n", (int) dp->di_size,
 			    (char *)dp->di_shortlink);
diff --git a/sbin/growfs/growfs.c b/sbin/growfs/growfs.c
index 73ac3549050..e0b0c863cfb 100644
--- a/sbin/growfs/growfs.c
+++ b/sbin/growfs/growfs.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: growfs.c,v 1.12 2005/04/14 19:58:32 deraadt Exp $	*/
+/*	$OpenBSD: growfs.c,v 1.13 2005/12/19 15:18:01 pedro Exp $	*/
 /*
  * Copyright (c) 2000 Christoph Herrmann, Thomas-Henning von Kamptz
  * Copyright (c) 1980, 1989, 1993 The Regents of the University of California.
@@ -46,7 +46,7 @@ static const char copyright[] =
 Copyright (c) 1980, 1989, 1993 The Regents of the University of California.\n\
 All rights reserved.\n";
 
-static const char rcsid[] = "$OpenBSD: growfs.c,v 1.12 2005/04/14 19:58:32 deraadt Exp $";
+static const char rcsid[] = "$OpenBSD: growfs.c,v 1.13 2005/12/19 15:18:01 pedro Exp $";
 #endif /* not lint */
 
 /* ********************************************************** INCLUDES ***** */
@@ -2243,7 +2243,8 @@ updrefs(int cg, ino_t in, struct gfs_bpp *bp, int fsi, int fso, unsigned int
 		DBG_LEAVE;
 		return; /* only check DIR, FILE, LINK */
 	}
-	if (((ino->di_mode & IFMT) == IFLNK) && (ino->di_size < MAXSYMLINKLEN)) {
+	if (((ino->di_mode & IFMT) == IFLNK) &&
+	    (ino->di_size < MAXSYMLINKLEN_UFS1)) {
 		DBG_LEAVE;
 		return;	/* skip short symlinks */
 	}
diff --git a/sbin/newfs/mkfs.c b/sbin/newfs/mkfs.c
index d13b639305c..1c7629e0b97 100644
--- a/sbin/newfs/mkfs.c
+++ b/sbin/newfs/mkfs.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mkfs.c,v 1.48 2005/08/08 20:27:22 otto Exp $	*/
+/*	$OpenBSD: mkfs.c,v 1.49 2005/12/19 15:18:01 pedro Exp $	*/
 /*	$NetBSD: mkfs.c,v 1.25 1995/06/18 21:35:38 cgd Exp $	*/
 
 /*
@@ -34,7 +34,7 @@
 #if 0
 static char sccsid[] = "@(#)mkfs.c	8.3 (Berkeley) 2/3/94";
 #else
-static char rcsid[] = "$OpenBSD: mkfs.c,v 1.48 2005/08/08 20:27:22 otto Exp $";
+static char rcsid[] = "$OpenBSD: mkfs.c,v 1.49 2005/12/19 15:18:01 pedro Exp $";
 #endif
 #endif /* not lint */
 
@@ -201,7 +201,7 @@ mkfs(struct partition *pp, char *fsys, int fi, int fo,
 		sblock.fs_maxsymlinklen = 0;
 	} else {
 		sblock.fs_inodefmt = FS_44INODEFMT;
-		sblock.fs_maxsymlinklen = MAXSYMLINKLEN;
+		sblock.fs_maxsymlinklen = MAXSYMLINKLEN_UFS1;
 	}
 	/*
 	 * Validate the given file system size.
diff --git a/sbin/newlfs/lfs.c b/sbin/newlfs/lfs.c
index def2fc304fd..504348a96dc 100644
--- a/sbin/newlfs/lfs.c
+++ b/sbin/newlfs/lfs.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: lfs.c,v 1.9 2004/07/17 02:14:33 deraadt Exp $	*/
+/*	$OpenBSD: lfs.c,v 1.10 2005/12/19 15:18:01 pedro Exp $	*/
 /*	$NetBSD: lfs.c,v 1.8 1995/06/19 21:30:36 cgd Exp $	*/
 
 /*-
@@ -34,7 +34,7 @@
 #if 0
 static char sccsid[] = "@(#)lfs.c	8.5 (Berkeley) 5/24/95";
 #else
-static char rcsid[] = "$OpenBSD: lfs.c,v 1.9 2004/07/17 02:14:33 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: lfs.c,v 1.10 2005/12/19 15:18:01 pedro Exp $";
 #endif
 #endif /* not lint */
 
@@ -130,7 +130,7 @@ static struct lfs lfs_default =  {
 	/* lfs_fbshift */	DFL_LFS_FBSHIFT,
 	/* lfs_fsbtodb */	0,
 	/* lfs_sushift */	0,
-	/* lfs_maxsymlinklen */	MAXSYMLINKLEN,
+	/* lfs_maxsymlinklen */	MAXSYMLINKLEN_UFS1,
 	/* lfs_sboffs */	{ 0 },
 	/* lfs_cksum */		0,
 	/* lfs_sp */		NULL,