[src/trunk]: src/usr.sbin/makefs add "ffs/ufs_inode.h" with a minimal struct ...

To: source-changes-hg%NetBSD.org@localhost
Subject: [src/trunk]: src/usr.sbin/makefs add "ffs/ufs_inode.h" with a minimal struct ...
From: lukem <lukem%NetBSD.org@localhost>
Date: Fri, 24 Jan 2020 10:16:27 +0000
details:   https://anonhg.NetBSD.org/src/rev/3559792b7102
branches:  trunk
changeset: 520325:3559792b7102
user:      lukem <lukem%NetBSD.org@localhost>
date:      Mon Jan 07 16:56:26 2002 +0000

description:
add "ffs/ufs_inode.h" with a minimal struct inode, to replace
<ufs/ufs/inode.h>, since the latter has a lot of cruft we don't need
and it #include's way more stuff in <sys/*> (etc) than is needed here.
yet another nail in the "let's make makefs a proper host tool" coffin.

diffstat:

 usr.sbin/makefs/ffs.c            |   6 +-
 usr.sbin/makefs/ffs/buf.c        |   6 +-
 usr.sbin/makefs/ffs/ffs_alloc.c  |   6 +-
 usr.sbin/makefs/ffs/ffs_balloc.c |   6 +-
 usr.sbin/makefs/ffs/ffs_extern.h |   4 +-
 usr.sbin/makefs/ffs/mkfs.c       |   6 +-
 usr.sbin/makefs/ffs/ufs_bmap.c   |   6 +-
 usr.sbin/makefs/ffs/ufs_inode.h  |  71 ++++++++++++++++++++++++++++++++++++++++
 8 files changed, 90 insertions(+), 21 deletions(-)

diffs (272 lines):

diff -r 705f6d0d0267 -r 3559792b7102 usr.sbin/makefs/ffs.c
--- a/usr.sbin/makefs/ffs.c     Mon Jan 07 16:48:02 2002 +0000
+++ b/usr.sbin/makefs/ffs.c     Mon Jan 07 16:56:26 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ffs.c,v 1.7 2002/01/07 16:27:22 lukem Exp $    */
+/*     $NetBSD: ffs.c,v 1.8 2002/01/07 16:56:26 lukem Exp $    */
 
 /*
  * Copyright (c) 2001 Wasabi Systems, Inc.
@@ -71,7 +71,7 @@
 
 #include <sys/cdefs.h>
 #ifndef __lint
-__RCSID("$NetBSD: ffs.c,v 1.7 2002/01/07 16:27:22 lukem Exp $");
+__RCSID("$NetBSD: ffs.c,v 1.8 2002/01/07 16:56:26 lukem Exp $");
 #endif /* !__lint */
 
 #include <sys/param.h>
@@ -92,9 +92,9 @@
 #include <ufs/ufs/dinode.h>
 #include <ufs/ufs/dir.h>
 #include <ufs/ffs/fs.h>
-#include <ufs/ufs/inode.h>
 #include <ufs/ufs/ufs_bswap.h>
 
+#include "ffs/ufs_inode.h"
 #include "ffs/newfs_extern.h"
 #include "ffs/ffs_extern.h"
 
diff -r 705f6d0d0267 -r 3559792b7102 usr.sbin/makefs/ffs/buf.c
--- a/usr.sbin/makefs/ffs/buf.c Mon Jan 07 16:48:02 2002 +0000
+++ b/usr.sbin/makefs/ffs/buf.c Mon Jan 07 16:56:26 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: buf.c,v 1.6 2002/01/07 16:27:23 lukem Exp $    */
+/*     $NetBSD: buf.c,v 1.7 2002/01/07 16:56:27 lukem Exp $    */
 
 /*
  * Copyright (c) 2001 Wasabi Systems, Inc.
@@ -37,7 +37,7 @@
 
 #include <sys/cdefs.h>
 #ifndef __lint
-__RCSID("$NetBSD: buf.c,v 1.6 2002/01/07 16:27:23 lukem Exp $");
+__RCSID("$NetBSD: buf.c,v 1.7 2002/01/07 16:56:27 lukem Exp $");
 #endif /* !__lint */
 
 #include <sys/param.h>
@@ -52,10 +52,10 @@
 
 #include "makefs.h"
 
-#include <ufs/ufs/inode.h>
 #include <ufs/ffs/fs.h>
 
 #include "ffs/buf.h"
+#include "ffs/ufs_inode.h"
 
 extern int sectorsize;         /* XXX: from ffs.c & mkfs.c */
 
diff -r 705f6d0d0267 -r 3559792b7102 usr.sbin/makefs/ffs/ffs_alloc.c
--- a/usr.sbin/makefs/ffs/ffs_alloc.c   Mon Jan 07 16:48:02 2002 +0000
+++ b/usr.sbin/makefs/ffs/ffs_alloc.c   Mon Jan 07 16:56:26 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ffs_alloc.c,v 1.5 2002/01/07 16:27:23 lukem Exp $      */
+/*     $NetBSD: ffs_alloc.c,v 1.6 2002/01/07 16:56:27 lukem Exp $      */
 /* From: NetBSD: ffs_alloc.c,v 1.50 2001/09/06 02:16:01 lukem Exp */
 
 /*
@@ -38,7 +38,7 @@
 
 #include <sys/cdefs.h>
 #ifndef __lint
-__RCSID("$NetBSD: ffs_alloc.c,v 1.5 2002/01/07 16:27:23 lukem Exp $");
+__RCSID("$NetBSD: ffs_alloc.c,v 1.6 2002/01/07 16:56:27 lukem Exp $");
 #endif /* !__lint */
 
 #include <sys/param.h>
@@ -50,10 +50,10 @@
 #include "makefs.h"
 
 #include <ufs/ufs/ufs_bswap.h>
-#include <ufs/ufs/inode.h>
 #include <ufs/ffs/fs.h>
 
 #include "ffs/buf.h"
+#include "ffs/ufs_inode.h"
 #include "ffs/ffs_extern.h"
 
 
diff -r 705f6d0d0267 -r 3559792b7102 usr.sbin/makefs/ffs/ffs_balloc.c
--- a/usr.sbin/makefs/ffs/ffs_balloc.c  Mon Jan 07 16:48:02 2002 +0000
+++ b/usr.sbin/makefs/ffs/ffs_balloc.c  Mon Jan 07 16:56:26 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ffs_balloc.c,v 1.6 2002/01/07 16:27:23 lukem Exp $     */
+/*     $NetBSD: ffs_balloc.c,v 1.7 2002/01/07 16:56:27 lukem Exp $     */
 /* From NetBSD: ffs_balloc.c,v 1.25 2001/08/08 08:36:36 lukem Exp */
 
 /*
@@ -38,7 +38,7 @@
 
 #include <sys/cdefs.h>
 #ifndef __lint
-__RCSID("$NetBSD: ffs_balloc.c,v 1.6 2002/01/07 16:27:23 lukem Exp $");
+__RCSID("$NetBSD: ffs_balloc.c,v 1.7 2002/01/07 16:56:27 lukem Exp $");
 #endif /* !__lint */
 
 #include <sys/param.h>
@@ -54,10 +54,10 @@
 #include "makefs.h"
 
 #include <ufs/ufs/ufs_bswap.h>
-#include <ufs/ufs/inode.h>
 #include <ufs/ffs/fs.h>
 
 #include "ffs/buf.h"
+#include "ffs/ufs_inode.h"
 #include "ffs/ffs_extern.h"
 
 /*
diff -r 705f6d0d0267 -r 3559792b7102 usr.sbin/makefs/ffs/ffs_extern.h
--- a/usr.sbin/makefs/ffs/ffs_extern.h  Mon Jan 07 16:48:02 2002 +0000
+++ b/usr.sbin/makefs/ffs/ffs_extern.h  Mon Jan 07 16:56:26 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ffs_extern.h,v 1.1.1.1 2001/10/26 06:21:48 lukem Exp $ */
+/*     $NetBSD: ffs_extern.h,v 1.2 2002/01/07 16:56:27 lukem Exp $     */
 /* From: NetBSD: ffs_extern.h,v 1.19 2001/08/17 02:18:48 lukem Exp */
 
 /*-
@@ -38,8 +38,6 @@
 
 #include "ffs/buf.h"
 
-#define i_fd   i_modrev                /* XXX: stuff this somewhere */
-
 /*
  * Structure used to pass around logical block paths generated by
  * ufs_getlbns and used by truncate and bmap code.
diff -r 705f6d0d0267 -r 3559792b7102 usr.sbin/makefs/ffs/mkfs.c
--- a/usr.sbin/makefs/ffs/mkfs.c        Mon Jan 07 16:48:02 2002 +0000
+++ b/usr.sbin/makefs/ffs/mkfs.c        Mon Jan 07 16:56:26 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: mkfs.c,v 1.4 2002/01/07 16:27:23 lukem Exp $   */
+/*     $NetBSD: mkfs.c,v 1.5 2002/01/07 16:56:27 lukem Exp $   */
 /* From NetBSD: mkfs.c,v 1.55 2001/09/06 02:16:01 lukem Exp $ */
 
 /*
@@ -39,7 +39,7 @@
 #if 0
 static char sccsid[] = "@(#)mkfs.c     8.11 (Berkeley) 5/3/95";
 #else
-__RCSID("$NetBSD: mkfs.c,v 1.4 2002/01/07 16:27:23 lukem Exp $");
+__RCSID("$NetBSD: mkfs.c,v 1.5 2002/01/07 16:56:27 lukem Exp $");
 #endif
 #endif /* not lint */
 
@@ -56,10 +56,10 @@
 #include "makefs.h"
 
 #include <ufs/ufs/dir.h>
-#include <ufs/ufs/inode.h>
 #include <ufs/ufs/ufs_bswap.h>
 #include <ufs/ffs/fs.h>
 
+#include "ffs/ufs_inode.h"
 #include "ffs/ffs_extern.h"
 #include "ffs/newfs_extern.h"
 
diff -r 705f6d0d0267 -r 3559792b7102 usr.sbin/makefs/ffs/ufs_bmap.c
--- a/usr.sbin/makefs/ffs/ufs_bmap.c    Mon Jan 07 16:48:02 2002 +0000
+++ b/usr.sbin/makefs/ffs/ufs_bmap.c    Mon Jan 07 16:56:26 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ufs_bmap.c,v 1.7 2002/01/07 16:27:23 lukem Exp $       */
+/*     $NetBSD: ufs_bmap.c,v 1.8 2002/01/07 16:56:28 lukem Exp $       */
 /* From: NetBSD: ufs_bmap.c,v 1.14 2001/11/08 05:00:51 chs Exp */
 
 /*
@@ -43,7 +43,7 @@
 
 #include <sys/cdefs.h>
 #ifndef __lint
-__RCSID("$NetBSD: ufs_bmap.c,v 1.7 2002/01/07 16:27:23 lukem Exp $");
+__RCSID("$NetBSD: ufs_bmap.c,v 1.8 2002/01/07 16:56:28 lukem Exp $");
 #endif /* !__lint */
 
 #include <sys/param.h>
@@ -56,10 +56,10 @@
 #include "makefs.h"
 
 #include <ufs/ufs/ufs_bswap.h>
-#include <ufs/ufs/inode.h>
 #include <ufs/ffs/fs.h>
 
 #include "ffs/buf.h"
+#include "ffs/ufs_inode.h"
 #include "ffs/ffs_extern.h"
 
 /*
diff -r 705f6d0d0267 -r 3559792b7102 usr.sbin/makefs/ffs/ufs_inode.h
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/usr.sbin/makefs/ffs/ufs_inode.h   Mon Jan 07 16:56:26 2002 +0000
@@ -0,0 +1,71 @@
+/*     $NetBSD: ufs_inode.h,v 1.1 2002/01/07 16:56:28 lukem Exp $      */
+/* From:  NetBSD: inode.h,v 1.27 2001/12/18 10:57:23 fvdl Exp $ */
+
+/*
+ * Copyright (c) 1982, 1989, 1993
+ *     The Regents of the University of California.  All rights reserved.
+ * (c) UNIX System Laboratories, Inc.
+ * All or some portions of this file are derived from material licensed
+ * to the University of California by American Telephone and Telegraph
+ * Co. or Unix System Laboratories, Inc. and are reproduced herein with
+ * the permission of UNIX System Laboratories, Inc.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *     This product includes software developed by the University of
+ *     California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ *     @(#)inode.h     8.9 (Berkeley) 5/14/95
+ */
+
+
+struct inode {
+       ino_t           i_number;       /* The identity of the inode. */
+       struct fs       *i_fs;          /* File system */
+       union {
+               struct  dinode ffs_din; /* 128 bytes of the on-disk dinode. */
+       } i_din;
+       int             i_fd;           /* File descriptor */
+};
+
+#define        i_ffs_atime             i_din.ffs_din.di_atime
+#define        i_ffs_atimensec         i_din.ffs_din.di_atimensec
+#define        i_ffs_blocks            i_din.ffs_din.di_blocks
+#define        i_ffs_ctime             i_din.ffs_din.di_ctime
+#define        i_ffs_ctimensec         i_din.ffs_din.di_ctimensec
+#define        i_ffs_db                i_din.ffs_din.di_db
+#define        i_ffs_flags             i_din.ffs_din.di_flags
+#define        i_ffs_gen               i_din.ffs_din.di_gen
+#define        i_ffs_gid               i_din.ffs_din.di_gid
+#define        i_ffs_ib                i_din.ffs_din.di_ib
+#define        i_ffs_mode              i_din.ffs_din.di_mode
+#define        i_ffs_mtime             i_din.ffs_din.di_mtime
+#define        i_ffs_mtimensec         i_din.ffs_din.di_mtimensec
+#define        i_ffs_nlink             i_din.ffs_din.di_nlink
+#define        i_ffs_rdev              i_din.ffs_din.di_rdev
+#define        i_ffs_shortlink         i_din.ffs_din.di_shortlink
+#define        i_ffs_size              i_din.ffs_din.di_size
+#define        i_ffs_uid               i_din.ffs_din.di_uid
Prev by Date: [src/trunk]: src/sys/arch/i386/conf Add entries for the 'esa at pci' audio dr...
Next by Date: [src/trunk]: src/sys/arch/i386/conf Re-enable radio at bktr.
Previous by Thread: [src/trunk]: src/sys/arch/i386/conf Add entries for the 'esa at pci' audio dr...
Next by Thread: [src/trunk]: src/sys/arch/i386/conf Re-enable radio at bktr.
Indexes:
Home | Main Index | Thread Index | Old Index