From 07436eeb490ec89202b2d484afca4eadf348cb88 Mon Sep 17 00:00:00 2001
From: Kirk McKusick <mckusick@FreeBSD.org>
Date: Wed, 14 Nov 2018 00:21:52 +0000
Subject: [PATCH] Fix build break from dump incompatibility I introduced in
 -r340411

Pointy-hat to: mckusick
---
 sbin/dump/dump.h     | 2 +-
 sbin/dump/main.c     | 4 ++--
 sbin/dump/traverse.c | 8 ++++----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/sbin/dump/dump.h b/sbin/dump/dump.h
index 97647a753a2d..680ff8a9b7a9 100644
--- a/sbin/dump/dump.h
+++ b/sbin/dump/dump.h
@@ -126,7 +126,7 @@ void	dumpabort(int signo) __dead2;
 void	dump_getfstab(void);
 
 char	*rawname(char *cp);
-union	dinode *getinode0(ino_t inum, int *mode);
+union	dinode *getino(ino_t inum, int *mode);
 
 /* rdump routines */
 #ifdef RDUMP
diff --git a/sbin/dump/main.c b/sbin/dump/main.c
index 05cfadc0716f..7301ca318d80 100644
--- a/sbin/dump/main.c
+++ b/sbin/dump/main.c
@@ -549,7 +549,7 @@ main(int argc, char *argv[])
 		/*
 		 * Skip directory inodes deleted and maybe reallocated
 		 */
-		dp = getinode0(ino, &mode);
+		dp = getino(ino, &mode);
 		if (mode != IFDIR)
 			continue;
 		(void)dumpino(dp, ino);
@@ -568,7 +568,7 @@ main(int argc, char *argv[])
 		/*
 		 * Skip inodes deleted and reallocated as directories.
 		 */
-		dp = getinode0(ino, &mode);
+		dp = getino(ino, &mode);
 		if (mode == IFDIR)
 			continue;
 		(void)dumpino(dp, ino);
diff --git a/sbin/dump/traverse.c b/sbin/dump/traverse.c
index 0a0cd31fd2a4..d094a08a7eb0 100644
--- a/sbin/dump/traverse.c
+++ b/sbin/dump/traverse.c
@@ -195,7 +195,7 @@ mapfiles(ino_t maxino, long *tapesize)
 		}
 		for (i = 0; i < inosused; i++, ino++) {
 			if (ino < UFS_ROOTINO ||
-			    (dp = getinode0(ino, &mode)) == NULL ||
+			    (dp = getino(ino, &mode)) == NULL ||
 			    (mode & IFMT) == 0)
 				continue;
 			if (ino >= maxino) {
@@ -277,7 +277,7 @@ mapdirs(ino_t maxino, long *tapesize)
 		nodump = !nonodump && (TSTINO(ino, usedinomap) == 0);
 		if ((isdir & 1) == 0 || (TSTINO(ino, dumpinomap) && !nodump))
 			continue;
-		dp = getinode0(ino, &i);
+		dp = getino(ino, &i);
 		/*
 		 * inode buf may change in searchdir().
 		 */
@@ -421,7 +421,7 @@ searchdir(
 				continue;
 		}
 		if (nodump) {
-			ip = getinode0(dp->d_ino, &mode);
+			ip = getino(dp->d_ino, &mode);
 			if (TSTINO(dp->d_ino, dumpinomap)) {
 				CLRINO(dp->d_ino, dumpinomap);
 				*tapesize -= blockest(ip);
@@ -875,7 +875,7 @@ writeheader(ino_t ino)
 }
 
 union dinode *
-getinode0(ino_t inum, int *modep)
+getino(ino_t inum, int *modep)
 {
 	static ino_t minino, maxino;
 	static caddr_t inoblock;