Module Name: src
Committed By: dholland
Date: Tue Sep 1 06:12:33 UTC 2015
Modified Files:
src/sbin/fsck_lfs: setup.c
src/sbin/newfs_lfs: make_lfs.c
src/sys/ufs/lfs: lfs_accessors.h
Log Message:
Tidy the MAXSYMLINKLEN macros.
To generate a diff of this commit:
cvs rdiff -u -r1.57 -r1.58 src/sbin/fsck_lfs/setup.c
cvs rdiff -u -r1.46 -r1.47 src/sbin/newfs_lfs/make_lfs.c
cvs rdiff -u -r1.19 -r1.20 src/sys/ufs/lfs/lfs_accessors.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/fsck_lfs/setup.c
diff -u src/sbin/fsck_lfs/setup.c:1.57 src/sbin/fsck_lfs/setup.c:1.58
--- src/sbin/fsck_lfs/setup.c:1.57 Tue Sep 1 06:12:04 2015
+++ src/sbin/fsck_lfs/setup.c Tue Sep 1 06:12:33 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: setup.c,v 1.57 2015/09/01 06:12:04 dholland Exp $ */
+/* $NetBSD: setup.c,v 1.58 2015/09/01 06:12:33 dholland Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -394,10 +394,10 @@ setup(const char *dev)
sbdirty();
}
}
- if (lfs_sb_getmaxsymlinklen(fs) != ULFS1_MAXSYMLINKLEN) {
+ if (lfs_sb_getmaxsymlinklen(fs) != LFS_MAXSYMLINKLEN(fs)) {
pwarn("INCORRECT MAXSYMLINKLEN=%d IN SUPERBLOCK (SHOULD BE %zu)",
- lfs_sb_getmaxsymlinklen(fs), ULFS1_MAXSYMLINKLEN);
- lfs_sb_setmaxsymlinklen(fs, ULFS1_MAXSYMLINKLEN);
+ lfs_sb_getmaxsymlinklen(fs), LFS_MAXSYMLINKLEN(fs));
+ lfs_sb_setmaxsymlinklen(fs, LFS_MAXSYMLINKLEN(fs));
if (preen)
printf(" (FIXED)\n");
if (preen || reply("FIX") == 1) {
Index: src/sbin/newfs_lfs/make_lfs.c
diff -u src/sbin/newfs_lfs/make_lfs.c:1.46 src/sbin/newfs_lfs/make_lfs.c:1.47
--- src/sbin/newfs_lfs/make_lfs.c:1.46 Tue Sep 1 06:12:04 2015
+++ src/sbin/newfs_lfs/make_lfs.c Tue Sep 1 06:12:33 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: make_lfs.c,v 1.46 2015/09/01 06:12:04 dholland Exp $ */
+/* $NetBSD: make_lfs.c,v 1.47 2015/09/01 06:12:33 dholland Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -62,7 +62,7 @@
#if 0
static char sccsid[] = "@(#)lfs.c 8.5 (Berkeley) 5/24/95";
#else
-__RCSID("$NetBSD: make_lfs.c,v 1.46 2015/09/01 06:12:04 dholland Exp $");
+__RCSID("$NetBSD: make_lfs.c,v 1.47 2015/09/01 06:12:33 dholland Exp $");
#endif
#endif /* not lint */
@@ -152,7 +152,7 @@ static const struct dlfs dlfs32_default
.dlfs_fbmask = DFL_LFS_FBMASK,
.dlfs_blktodb = 0,
.dlfs_sushift = 0,
- .dlfs_maxsymlinklen = ULFS1_MAXSYMLINKLEN,
+ .dlfs_maxsymlinklen = LFS32_MAXSYMLINKLEN,
.dlfs_sboffs = { 0 },
.dlfs_nclean = 0,
.dlfs_fsmnt = { 0 },
@@ -216,7 +216,7 @@ static const struct dlfs64 dlfs64_defaul
.dlfs_blktodb = 0,
.dlfs_sushift = 0,
.dlfs_sboffs = { 0 },
- .dlfs_maxsymlinklen = ULFS2_MAXSYMLINKLEN,
+ .dlfs_maxsymlinklen = LFS64_MAXSYMLINKLEN,
.dlfs_nclean = 0,
.dlfs_fsmnt = { 0 },
.dlfs_pflags = LFS_PF_CLEAN,
Index: src/sys/ufs/lfs/lfs_accessors.h
diff -u src/sys/ufs/lfs/lfs_accessors.h:1.19 src/sys/ufs/lfs/lfs_accessors.h:1.20
--- src/sys/ufs/lfs/lfs_accessors.h:1.19 Tue Sep 1 06:12:04 2015
+++ src/sys/ufs/lfs/lfs_accessors.h Tue Sep 1 06:12:33 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: lfs_accessors.h,v 1.19 2015/09/01 06:12:04 dholland Exp $ */
+/* $NetBSD: lfs_accessors.h,v 1.20 2015/09/01 06:12:33 dholland Exp $ */
/* from NetBSD: lfs.h,v 1.165 2015/07/24 06:59:32 dholland Exp */
/* from NetBSD: dinode.h,v 1.22 2013/01/22 09:39:18 dholland Exp */
@@ -208,12 +208,16 @@
/*
* Maximum length of a symlink that can be stored within the inode.
*/
-#define ULFS1_MAXSYMLINKLEN ((ULFS_NDADDR + ULFS_NIADDR) * sizeof(int32_t))
-#define ULFS2_MAXSYMLINKLEN ((ULFS_NDADDR + ULFS_NIADDR) * sizeof(int64_t))
+#define LFS32_MAXSYMLINKLEN ((ULFS_NDADDR + ULFS_NIADDR) * sizeof(int32_t))
+#define LFS64_MAXSYMLINKLEN ((ULFS_NDADDR + ULFS_NIADDR) * sizeof(int64_t))
+#define LFS_MAXSYMLINKLEN(fs) \
+ ((fs)->lfs_is64 ? LFS64_MAXSYMLINKLEN : LFS32_MAXSYMLINKLEN)
+
+/* get rid of this eventually */
#define ULFS_MAXSYMLINKLEN(ip) \
((ip)->i_ump->um_fstype == ULFS1) ? \
- ULFS1_MAXSYMLINKLEN : ULFS2_MAXSYMLINKLEN
+ LFS32_MAXSYMLINKLEN : LFS64_MAXSYMLINKLEN
#define DINOSIZE(fs) ((fs)->lfs_is64 ? sizeof(struct lfs64_dinode) : sizeof(struct lfs32_dinode))
