Module Name: src
Committed By: riastradh
Date: Sun Feb 23 15:11:33 UTC 2020
Modified Files:
src/sbin/fsck_lfs: pass1.c
src/usr.sbin/dumplfs: dumplfs.c
Log Message:
Fix userland references to LFS_ORPHAN_NEXTFREE.
Forgot to grep for these or do a full distribution build, oops!
To generate a diff of this commit:
cvs rdiff -u -r1.45 -r1.46 src/sbin/fsck_lfs/pass1.c
cvs rdiff -u -r1.64 -r1.65 src/usr.sbin/dumplfs/dumplfs.c
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/pass1.c
diff -u src/sbin/fsck_lfs/pass1.c:1.45 src/sbin/fsck_lfs/pass1.c:1.46
--- src/sbin/fsck_lfs/pass1.c:1.45 Sat Oct 3 08:30:13 2015
+++ src/sbin/fsck_lfs/pass1.c Sun Feb 23 15:11:33 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: pass1.c,v 1.45 2015/10/03 08:30:13 dholland Exp $ */
+/* $NetBSD: pass1.c,v 1.46 2020/02/23 15:11:33 riastradh Exp $ */
/*
* Copyright (c) 1980, 1986, 1993
@@ -307,7 +307,7 @@ checkinode(ino_t inumber, struct inodesc
*/
if (lfs_dino_getnlink(fs, dp) <= 0) {
LFS_IENTRY(ifp, fs, inumber, bp);
- if (lfs_if_getnextfree(fs, ifp) == LFS_ORPHAN_NEXTFREE) {
+ if (lfs_if_getnextfree(fs, ifp) == LFS_ORPHAN_NEXTFREE(fs)) {
statemap[inumber] = (mode == LFS_IFDIR ? DCLEAR : FCLEAR);
/* Add this to our list of orphans */
zlnp = emalloc(sizeof *zlnp);
Index: src/usr.sbin/dumplfs/dumplfs.c
diff -u src/usr.sbin/dumplfs/dumplfs.c:1.64 src/usr.sbin/dumplfs/dumplfs.c:1.65
--- src/usr.sbin/dumplfs/dumplfs.c:1.64 Fri Jun 15 15:16:05 2018
+++ src/usr.sbin/dumplfs/dumplfs.c Sun Feb 23 15:11:33 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: dumplfs.c,v 1.64 2018/06/15 15:16:05 christos Exp $ */
+/* $NetBSD: dumplfs.c,v 1.65 2020/02/23 15:11:33 riastradh Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -40,7 +40,7 @@ __COPYRIGHT("@(#) Copyright (c) 1991, 19
#if 0
static char sccsid[] = "@(#)dumplfs.c 8.5 (Berkeley) 5/24/95";
#else
-__RCSID("$NetBSD: dumplfs.c,v 1.64 2018/06/15 15:16:05 christos Exp $");
+__RCSID("$NetBSD: dumplfs.c,v 1.65 2020/02/23 15:11:33 riastradh Exp $");
#endif
#endif /* not lint */
@@ -133,7 +133,7 @@ print_ientry(int i, struct lfs *lfsp, IF
else
printf("%d\tINUSE\t%u\t%8jX\t%s\n",
i, version, (intmax_t)daddr,
- nextfree == LFS_ORPHAN_NEXTFREE ? "FFFFFFFF" : "-");
+ nextfree == LFS_ORPHAN_NEXTFREE(lfsp) ? "orphan" : "-");
}
/*
