Author: glebius
Date: Tue Nov 13 23:44:27 2018
New Revision: 340416
URL: https://svnweb.freebsd.org/changeset/base/340416

Log:
  Plug build break after r340411.

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       Tue Nov 13 23:20:55 2018        (r340415)
+++ head/sbin/dump/dump.h       Tue Nov 13 23:44:27 2018        (r340416)
@@ -126,7 +126,7 @@ void        dumpabort(int signo) __dead2;
 void   dump_getfstab(void);
 
 char   *rawname(char *cp);
-union  dinode *getinode(ino_t inum, int *mode);
+union  dinode *getinode0(ino_t inum, int *mode);
 
 /* rdump routines */
 #ifdef RDUMP

Modified: head/sbin/dump/main.c
==============================================================================
--- head/sbin/dump/main.c       Tue Nov 13 23:20:55 2018        (r340415)
+++ head/sbin/dump/main.c       Tue Nov 13 23:44:27 2018        (r340416)
@@ -549,7 +549,7 @@ main(int argc, char *argv[])
                /*
                 * Skip directory inodes deleted and maybe reallocated
                 */
-               dp = getinode(ino, &mode);
+               dp = getinode0(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 = getinode(ino, &mode);
+               dp = getinode0(ino, &mode);
                if (mode == IFDIR)
                        continue;
                (void)dumpino(dp, ino);

Modified: head/sbin/dump/traverse.c
==============================================================================
--- head/sbin/dump/traverse.c   Tue Nov 13 23:20:55 2018        (r340415)
+++ head/sbin/dump/traverse.c   Tue Nov 13 23:44:27 2018        (r340416)
@@ -195,7 +195,7 @@ mapfiles(ino_t maxino, long *tapesize)
                }
                for (i = 0; i < inosused; i++, ino++) {
                        if (ino < UFS_ROOTINO ||
-                           (dp = getinode(ino, &mode)) == NULL ||
+                           (dp = getinode0(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 = getinode(ino, &i);
+               dp = getinode0(ino, &i);
                /*
                 * inode buf may change in searchdir().
                 */
@@ -421,7 +421,7 @@ searchdir(
                                continue;
                }
                if (nodump) {
-                       ip = getinode(dp->d_ino, &mode);
+                       ip = getinode0(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 *
-getinode(ino_t inum, int *modep)
+getinode0(ino_t inum, int *modep)
 {
        static ino_t minino, maxino;
        static caddr_t inoblock;
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Reply via email to