1 files changed, 9 insertions, 9 deletions

diff --git a/sbin/restore/restore.c b/sbin/restore/restore.c
index fbc24ece7c49..107fe28f5694 100644
--- a/sbin/restore/restore.c
+++ b/sbin/restore/restore.c
@@ -81,7 +81,7 @@ addfile(char *name, ino_t ino, int type)
 		dprintf(stdout, "%s: not on the tape\n", name);
 		return (descend);
 	}
-	if (ino == WINO && command == 'i' && !vflag)
+	if (ino == UFS_WINO && command == 'i' && !vflag)
 		return (descend);
 	if (!mflag) {
 		(void) sprintf(buf, "./%ju", (uintmax_t)ino);
@@ -156,7 +156,7 @@ removeoldleaves(void)
 	ino_t i, mydirino;
 
 	vprintf(stdout, "Mark entries to be removed.\n");
-	if ((ep = lookupino(WINO))) {
+	if ((ep = lookupino(UFS_WINO))) {
 		vprintf(stdout, "Delete whiteouts\n");
 		for ( ; ep != NULL; ep = nextep) {
 			nextep = ep->e_links;
@@ -172,7 +172,7 @@ removeoldleaves(void)
 			freeentry(ep);
 		}
 	}
-	for (i = ROOTINO + 1; i < maxino; i++) {
+	for (i = UFS_ROOTINO + 1; i < maxino; i++) {
 		ep = lookupino(i);
 		if (ep == NULL)
 			continue;
@@ -516,7 +516,7 @@ findunreflinks(void)
 	ino_t i;
 
 	vprintf(stdout, "Find unreferenced names.\n");
-	for (i = ROOTINO; i < maxino; i++) {
+	for (i = UFS_ROOTINO; i < maxino; i++) {
 		ep = lookupino(i);
 		if (ep == NULL || ep->e_type == LEAF || TSTINO(i, dumpmap) == 0)
 			continue;
@@ -599,7 +599,7 @@ createleaves(char *symtabfile)
 		vprintf(stdout, "Extract new leaves.\n");
 		dumpsymtable(symtabfile, volno);
 	}
-	first = lowerbnd(ROOTINO);
+	first = lowerbnd(UFS_ROOTINO);
 	curvol = volno;
 	while (curfile.ino < maxino) {
 		first = lowerbnd(first);
@@ -677,7 +677,7 @@ createfiles(void)
 	getvol((long)1);
 	skipmaps();
 	skipdirs();
-	first = lowerbnd(ROOTINO);
+	first = lowerbnd(UFS_ROOTINO);
 	last = upperbnd(maxino - 1);
 	for (;;) {
 		curvol = volno;
@@ -780,7 +780,7 @@ createlinks(void)
 	ino_t i;
 	char name[BUFSIZ];
 
-	if ((ep = lookupino(WINO))) {
+	if ((ep = lookupino(UFS_WINO))) {
 		vprintf(stdout, "Add whiteouts\n");
 		for ( ; ep != NULL; ep = ep->e_links) {
 			if ((ep->e_flags & NEW) == 0)
@@ -790,7 +790,7 @@ createlinks(void)
 		}
 	}
 	vprintf(stdout, "Add links\n");
-	for (i = ROOTINO; i < maxino; i++) {
+	for (i = UFS_ROOTINO; i < maxino; i++) {
 		ep = lookupino(i);
 		if (ep == NULL)
 			continue;
@@ -820,7 +820,7 @@ checkrestore(void)
 	ino_t i;
 
 	vprintf(stdout, "Check the symbol table.\n");
-	for (i = WINO; i < maxino; i++) {
+	for (i = UFS_WINO; i < maxino; i++) {
 		for (ep = lookupino(i); ep != NULL; ep = ep->e_links) {
 			ep->e_flags &= ~KEEP;
 			if (ep->e_type == NODE)