[src/trunk]: src/sbin/dump handle new lfs split

To: source-changes-hg%NetBSD.org@localhost
Subject: [src/trunk]: src/sbin/dump handle new lfs split
From: christos <christos%NetBSD.org@localhost>
Date: Tue, 07 Apr 2020 00:45:25 +0000
details:   https://anonhg.NetBSD.org/src/rev/d7fc51e0e166
branches:  trunk
changeset: 787389:d7fc51e0e166
user:      christos <christos%NetBSD.org@localhost>
date:      Sat Jun 15 01:27:19 2013 +0000

description:
handle new lfs split

diffstat:

 sbin/dump/dump.h     |  11 ++++++++++-
 sbin/dump/dumprmt.c  |   7 ++-----
 sbin/dump/itime.c    |   7 ++-----
 sbin/dump/main.c     |   7 ++-----
 sbin/dump/optr.c     |   6 ++----
 sbin/dump/rcache.c   |   5 ++---
 sbin/dump/tape.c     |   7 ++-----
 sbin/dump/traverse.c |   7 ++-----
 sbin/dump/unctime.c  |   5 ++---
 9 files changed, 26 insertions(+), 36 deletions(-)

diffs (259 lines):

diff -r f8730ed6e347 -r d7fc51e0e166 sbin/dump/dump.h
--- a/sbin/dump/dump.h  Sat Jun 15 01:26:48 2013 +0000
+++ b/sbin/dump/dump.h  Sat Jun 15 01:27:19 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: dump.h,v 1.50 2013/01/22 09:39:11 dholland Exp $       */
+/*     $NetBSD: dump.h,v 1.51 2013/06/15 01:27:19 christos Exp $       */
 
 /*-
  * Copyright (c) 1980, 1993
@@ -32,10 +32,19 @@
  */
 
 #include <machine/bswap.h>
+#ifdef DUMP_LFS
+#include <ufs/lfs/lfs.h>
+#endif
+#include <ufs/ufs/dinode.h>
+#include <protocols/dumprestore.h>
 
 union dinode {
        struct ufs1_dinode dp1;
        struct ufs2_dinode dp2;
+#ifdef DUMP_LFS
+       struct ulfs1_dinode dlp1;
+       struct ulfs2_dinode dlp2;
+#endif
 };
 #define DIP(dp, field) \
        (is_ufs2 ? (dp)->dp2.di_##field : (dp)->dp1.di_##field)
diff -r f8730ed6e347 -r d7fc51e0e166 sbin/dump/dumprmt.c
--- a/sbin/dump/dumprmt.c       Sat Jun 15 01:26:48 2013 +0000
+++ b/sbin/dump/dumprmt.c       Sat Jun 15 01:27:19 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: dumprmt.c,v 1.36 2013/01/13 22:54:24 dholland Exp $    */
+/*     $NetBSD: dumprmt.c,v 1.37 2013/06/15 01:27:19 christos Exp $    */
 
 /*-
  * Copyright (c) 1980, 1993
@@ -34,7 +34,7 @@
 #if 0
 static char sccsid[] = "@(#)dumprmt.c  8.3 (Berkeley) 4/28/95";
 #else
-__RCSID("$NetBSD: dumprmt.c,v 1.36 2013/01/13 22:54:24 dholland Exp $");
+__RCSID("$NetBSD: dumprmt.c,v 1.37 2013/06/15 01:27:19 christos Exp $");
 #endif
 #endif /* not lint */
 
@@ -43,15 +43,12 @@
 #include <sys/ioctl.h>
 #include <sys/socket.h>
 #include <sys/time.h>
-#include <ufs/ufs/dinode.h>
 
 #include <netinet/in.h>
 #include <netinet/in_systm.h>
 #include <netinet/ip.h>
 #include <netinet/tcp.h>
 
-#include <protocols/dumprestore.h>
-
 #include <ctype.h>
 #include <err.h>
 #include <errno.h>
diff -r f8730ed6e347 -r d7fc51e0e166 sbin/dump/itime.c
--- a/sbin/dump/itime.c Sat Jun 15 01:26:48 2013 +0000
+++ b/sbin/dump/itime.c Sat Jun 15 01:27:19 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: itime.c,v 1.19 2013/01/13 22:53:01 dholland Exp $      */
+/*     $NetBSD: itime.c,v 1.20 2013/06/15 01:27:19 christos Exp $      */
 
 /*-
  * Copyright (c) 1980, 1993
@@ -34,16 +34,13 @@
 #if 0
 static char sccsid[] = "@(#)itime.c    8.1 (Berkeley) 6/5/93";
 #else
-__RCSID("$NetBSD: itime.c,v 1.19 2013/01/13 22:53:01 dholland Exp $");
+__RCSID("$NetBSD: itime.c,v 1.20 2013/06/15 01:27:19 christos Exp $");
 #endif
 #endif /* not lint */
 
 #include <sys/param.h>
 #include <sys/queue.h>
 #include <sys/time.h>
-#include <ufs/ufs/dinode.h>
-
-#include <protocols/dumprestore.h>
 
 #include <errno.h>
 #include <fcntl.h>
diff -r f8730ed6e347 -r d7fc51e0e166 sbin/dump/main.c
--- a/sbin/dump/main.c  Sat Jun 15 01:26:48 2013 +0000
+++ b/sbin/dump/main.c  Sat Jun 15 01:27:19 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: main.c,v 1.69 2012/04/07 16:44:10 christos Exp $       */
+/*     $NetBSD: main.c,v 1.70 2013/06/15 01:27:19 christos Exp $       */
 
 /*-
  * Copyright (c) 1980, 1991, 1993, 1994
@@ -39,7 +39,7 @@
 #if 0
 static char sccsid[] = "@(#)main.c     8.6 (Berkeley) 5/1/95";
 #else
-__RCSID("$NetBSD: main.c,v 1.69 2012/04/07 16:44:10 christos Exp $");
+__RCSID("$NetBSD: main.c,v 1.70 2013/06/15 01:27:19 christos Exp $");
 #endif
 #endif /* not lint */
 
@@ -48,12 +48,9 @@
 #include <sys/stat.h>
 #include <sys/mount.h>
 
-#include <ufs/ufs/dinode.h>
 #include <ufs/ffs/fs.h>
 #include <ufs/ffs/ffs_extern.h>
 
-#include <protocols/dumprestore.h>
-
 #include <ctype.h>
 #include <err.h>
 #include <errno.h>
diff -r f8730ed6e347 -r d7fc51e0e166 sbin/dump/optr.c
--- a/sbin/dump/optr.c  Sat Jun 15 01:26:48 2013 +0000
+++ b/sbin/dump/optr.c  Sat Jun 15 01:27:19 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: optr.c,v 1.40 2013/01/13 23:07:16 dholland Exp $       */
+/*     $NetBSD: optr.c,v 1.41 2013/06/15 01:27:19 christos Exp $       */
 
 /*-
  * Copyright (c) 1980, 1988, 1993
@@ -34,7 +34,7 @@
 #if 0
 static char sccsid[] = "@(#)optr.c     8.2 (Berkeley) 1/6/94";
 #else
-__RCSID("$NetBSD: optr.c,v 1.40 2013/01/13 23:07:16 dholland Exp $");
+__RCSID("$NetBSD: optr.c,v 1.41 2013/06/15 01:27:19 christos Exp $");
 #endif
 #endif /* not lint */
 
@@ -58,8 +58,6 @@
 #include <unistd.h>
 #include <util.h>
 
-#include <ufs/ufs/dinode.h>
-
 #include "dump.h"
 #include "pathnames.h"
 
diff -r f8730ed6e347 -r d7fc51e0e166 sbin/dump/rcache.c
--- a/sbin/dump/rcache.c        Sat Jun 15 01:26:48 2013 +0000
+++ b/sbin/dump/rcache.c        Sat Jun 15 01:27:19 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: rcache.c,v 1.23 2010/01/27 12:20:25 spz Exp $  */
+/*     $NetBSD: rcache.c,v 1.24 2013/06/15 01:27:19 christos Exp $     */
 
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: rcache.c,v 1.23 2010/01/27 12:20:25 spz Exp $");
+__RCSID("$NetBSD: rcache.c,v 1.24 2013/06/15 01:27:19 christos Exp $");
 #endif /* not lint */
 
 #include <sys/types.h>
@@ -40,7 +40,6 @@
 #include <sys/mman.h>
 #include <sys/param.h>
 #include <sys/sysctl.h>
-#include <ufs/ufs/dinode.h>
 
 #include <stdio.h>
 #include <stdlib.h>
diff -r f8730ed6e347 -r d7fc51e0e166 sbin/dump/tape.c
--- a/sbin/dump/tape.c  Sat Jun 15 01:26:48 2013 +0000
+++ b/sbin/dump/tape.c  Sat Jun 15 01:27:19 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: tape.c,v 1.52 2013/01/13 23:17:18 dholland Exp $       */
+/*     $NetBSD: tape.c,v 1.53 2013/06/15 01:27:19 christos Exp $       */
 
 /*-
  * Copyright (c) 1980, 1991, 1993
@@ -34,7 +34,7 @@
 #if 0
 static char sccsid[] = "@(#)tape.c     8.4 (Berkeley) 5/1/95";
 #else
-__RCSID("$NetBSD: tape.c,v 1.52 2013/01/13 23:17:18 dholland Exp $");
+__RCSID("$NetBSD: tape.c,v 1.53 2013/06/15 01:27:19 christos Exp $");
 #endif
 #endif /* not lint */
 
@@ -42,12 +42,9 @@
 #include <sys/socket.h>
 #include <sys/time.h>
 #include <sys/wait.h>
-#include <ufs/ufs/dinode.h>
 #include <sys/ioctl.h>
 #include <sys/mtio.h>
 
-#include <protocols/dumprestore.h>
-
 #include <errno.h>
 #include <fcntl.h>
 #include <signal.h>
diff -r f8730ed6e347 -r d7fc51e0e166 sbin/dump/traverse.c
--- a/sbin/dump/traverse.c      Sat Jun 15 01:26:48 2013 +0000
+++ b/sbin/dump/traverse.c      Sat Jun 15 01:27:19 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: traverse.c,v 1.49 2013/01/22 09:39:11 dholland Exp $   */
+/*     $NetBSD: traverse.c,v 1.50 2013/06/15 01:27:19 christos Exp $   */
 
 /*-
  * Copyright (c) 1980, 1988, 1991, 1993
@@ -34,7 +34,7 @@
 #if 0
 static char sccsid[] = "@(#)traverse.c 8.7 (Berkeley) 6/15/95";
 #else
-__RCSID("$NetBSD: traverse.c,v 1.49 2013/01/22 09:39:11 dholland Exp $");
+__RCSID("$NetBSD: traverse.c,v 1.50 2013/06/15 01:27:19 christos Exp $");
 #endif
 #endif /* not lint */
 
@@ -42,12 +42,9 @@
 #include <sys/time.h>
 #include <sys/stat.h>
 #include <ufs/ufs/dir.h>
-#include <ufs/ufs/dinode.h>
 #include <ufs/ffs/fs.h>
 #include <ufs/ffs/ffs_extern.h>
 
-#include <protocols/dumprestore.h>
-
 #include <ctype.h>
 #include <errno.h>
 #include <fts.h>
diff -r f8730ed6e347 -r d7fc51e0e166 sbin/dump/unctime.c
--- a/sbin/dump/unctime.c       Sat Jun 15 01:26:48 2013 +0000
+++ b/sbin/dump/unctime.c       Sat Jun 15 01:27:19 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: unctime.c,v 1.16 2013/01/13 22:53:01 dholland Exp $    */
+/*     $NetBSD: unctime.c,v 1.17 2013/06/15 01:27:19 christos Exp $    */
 
 /*-
  * Copyright (c) 1980, 1993
@@ -34,12 +34,11 @@
 #if 0
 static char sccsid[] = "@(#)unctime.c  8.2 (Berkeley) 6/14/94";
 #else
-__RCSID("$NetBSD: unctime.c,v 1.16 2013/01/13 22:53:01 dholland Exp $");
+__RCSID("$NetBSD: unctime.c,v 1.17 2013/06/15 01:27:19 christos Exp $");
 #endif
 #endif /* not lint */
 
 #include <sys/param.h>
-#include <ufs/ufs/dinode.h>
 #include <time.h>
 #include "dump.h"
Prev by Date: [src/trunk]: src/sys/arch/x68k/stand/boot_ufs adjust to the lfs splitadjust t...
Next by Date: [src/trunk]: src/sys/arch/x68k/stand/boot_ufs revert previous
Previous by Thread: [src/trunk]: src/sys/arch/x68k/stand/boot_ufs adjust to the lfs splitadjust t...
Next by Thread: [src/trunk]: src/sys/arch/x68k/stand/boot_ufs revert previous
Indexes:
Home | Main Index | Thread Index | Old Index