d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix build break from dump incompatibility I introduced in -r340411

Browse Source 
Pointy-hat to: mckusick
This commit is contained in:
Kirk McKusick 2018-11-14 00:21:52 +00:00
parent dee401e833
commit 07436eeb49
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=340422
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sbin/dump/dump.h
View File

@ -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

4
sbin/dump/main.c
View File

@ -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);

8
sbin/dump/traverse.c
View File

@ -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;