Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src Fix userland references to LFS_ORPHAN_NEXTFREE.



details:   https://anonhg.NetBSD.org/src/rev/2e1ca4a2e9d4
branches:  trunk
changeset: 849215:2e1ca4a2e9d4
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Sun Feb 23 15:11:33 2020 +0000

description:
Fix userland references to LFS_ORPHAN_NEXTFREE.

Forgot to grep for these or do a full distribution build, oops!

diffstat:

 sbin/fsck_lfs/pass1.c      |  4 ++--
 usr.sbin/dumplfs/dumplfs.c |  6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diffs (45 lines):

diff -r 26f3b932c6fc -r 2e1ca4a2e9d4 sbin/fsck_lfs/pass1.c
--- a/sbin/fsck_lfs/pass1.c     Sun Feb 23 15:09:55 2020 +0000
+++ b/sbin/fsck_lfs/pass1.c     Sun Feb 23 15:11:33 2020 +0000
@@ -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 @@
         */
        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);
diff -r 26f3b932c6fc -r 2e1ca4a2e9d4 usr.sbin/dumplfs/dumplfs.c
--- a/usr.sbin/dumplfs/dumplfs.c        Sun Feb 23 15:09:55 2020 +0000
+++ b/usr.sbin/dumplfs/dumplfs.c        Sun Feb 23 15:11:33 2020 +0000
@@ -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 @@
 #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 @@
        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" : "-");
 }
 
 /*



Home | Main Index | Thread Index | Old Index