Skip site navigation (1)Skip section navigation (2) 
Date:      Wed, 14 Nov 2018 00:21:52 +0000 (UTC)
From:      Kirk McKusick <mckusick@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r340422 - head/sbin/dump
Message-ID:  <201811140021.wAE0LqWa008265@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: mckusick
Date: Wed Nov 14 00:21:52 2018
New Revision: 340422
URL: https://svnweb.freebsd.org/changeset/base/340422

Log:
  Fix build break from dump incompatibility I introduced in -r340411
  
  Pointy-hat to: mckusick

Modified:
  head/sbin/dump/dump.h
  head/sbin/dump/main.c
  head/sbin/dump/traverse.c

Modified: head/sbin/dump/dump.h
==============================================================================
--- head/sbin/dump/dump.h	Wed Nov 14 00:21:49 2018	(r340421)
+++ head/sbin/dump/dump.h	Wed Nov 14 00:21:52 2018	(r340422)
@@ -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

Modified: head/sbin/dump/main.c
==============================================================================
--- head/sbin/dump/main.c	Wed Nov 14 00:21:49 2018	(r340421)
+++ head/sbin/dump/main.c	Wed Nov 14 00:21:52 2018	(r340422)
@@ -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);

Modified: head/sbin/dump/traverse.c
==============================================================================
--- head/sbin/dump/traverse.c	Wed Nov 14 00:21:49 2018	(r340421)
+++ head/sbin/dump/traverse.c	Wed Nov 14 00:21:52 2018	(r340422)
@@ -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;

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201811140021.wAE0LqWa008265>