[src/trunk]: src Cleanups and hacks to make lfs userland stuff build:

To: source-changes-hg%NetBSD.org@localhost
Subject: [src/trunk]: src Cleanups and hacks to make lfs userland stuff build:
From: dholland <dholland%NetBSD.org@localhost>
Date: Tue, 07 Apr 2020 00:43:29 +0000
details:   https://anonhg.NetBSD.org/src/rev/7457bef9bf24
branches:  trunk
changeset: 787210:7457bef9bf24
user:      dholland <dholland%NetBSD.org@localhost>
date:      Thu Jun 06 00:54:49 2013 +0000

description:
Cleanups and hacks to make lfs userland stuff build:
   - lfs_cksum.c doesn't actually need ulfs_inode.h any more.
   - neither does lfs_itimes.c.
   - add hacks to fsck_lfs to make it compile.
   - add hacks to newfs_lfs to make it compile.
   - fix warning in ulfs_quota.c when quotas are fully disabled
     (as I guess is happening with the rumpity version)

XXX: This commit adds -I${NETBSDSRCDIR}/sys to the Makefiles for
XXX: fsck_lfs, newfs_lfs, and lfs_cleanerd. This needs to be cleaned
XXX: up ASAP; but I consider this less problematic in the short term
XXX: than spewing ulfs_*.h into /usr/include.

diffstat:

 libexec/lfs_cleanerd/Makefile     |   5 ++++-
 libexec/lfs_cleanerd/Makefile.inc |   5 ++++-
 sbin/fsck_lfs/Makefile            |   5 ++++-
 sbin/fsck_lfs/inode.c             |   5 +++--
 sbin/fsck_lfs/lfs.c               |   5 +++--
 sbin/fsck_lfs/pass0.c             |   5 +++--
 sbin/fsck_lfs/pass1.c             |   5 +++--
 sbin/fsck_lfs/pass3.c             |   4 ++--
 sbin/fsck_lfs/pass4.c             |   5 +++--
 sbin/fsck_lfs/pass5.c             |   5 +++--
 sbin/fsck_lfs/pass6.c             |   6 ++++--
 sbin/fsck_lfs/segwrite.c          |   9 +++++----
 sbin/fsck_lfs/setup.c             |   5 +++--
 sbin/fsck_lfs/vars.c              |   4 ++--
 sbin/fsck_lfs/vnode.c             |   6 ++++--
 sbin/newfs_lfs/Makefile           |   5 ++++-
 sbin/newfs_lfs/make_lfs.c         |  12 ++++++------
 sys/rump/fs/lib/liblfs/Makefile   |   9 ++++++++-
 sys/ufs/lfs/lfs_cksum.c           |   5 ++---
 sys/ufs/lfs/lfs_itimes.c          |   9 +++++----
 sys/ufs/lfs/ulfs_quota.c          |   8 ++++++--
 21 files changed, 81 insertions(+), 46 deletions(-)

diffs (truncated from 493 to 300 lines):

diff -r 5729bbab2bac -r 7457bef9bf24 libexec/lfs_cleanerd/Makefile
--- a/libexec/lfs_cleanerd/Makefile     Thu Jun 06 00:53:35 2013 +0000
+++ b/libexec/lfs_cleanerd/Makefile     Thu Jun 06 00:54:49 2013 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.15 2009/08/06 00:51:55 pooka Exp $
+#      $NetBSD: Makefile,v 1.16 2013/06/06 00:54:49 dholland Exp $
 #      @(#)Makefile    8.1 (Berkeley) 6/18/93
 
 .include "Makefile.inc"
@@ -6,6 +6,9 @@
 PROG=  lfs_cleanerd
 MAN=   lfs_cleanerd.8
 
+# XXX
+CPPFLAGS+=-I${NETBSDSRCDIR}/sys
+
 BINDIR=                /libexec
 .if (${MKDYNAMICROOT} == "no")
 LDSTATIC?=      -static
diff -r 5729bbab2bac -r 7457bef9bf24 libexec/lfs_cleanerd/Makefile.inc
--- a/libexec/lfs_cleanerd/Makefile.inc Thu Jun 06 00:53:35 2013 +0000
+++ b/libexec/lfs_cleanerd/Makefile.inc Thu Jun 06 00:54:49 2013 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.inc,v 1.3 2010/07/28 22:35:52 pooka Exp $
+#      $NetBSD: Makefile.inc,v 1.4 2013/06/06 00:54:49 dholland Exp $
 #      @(#)Makefile    8.1 (Berkeley) 6/18/93
 
 WARNS?=3               # XXX: too many sign-compare issues
@@ -19,3 +19,6 @@
 CPPFLAGS+="-DKASSERT(x)="
 #CPPFLAGS+=-DREPAIR_ZERO_FINFO
 #CPPFLAGS+=-DTEST_PATTERN
+
+# XXX
+CPPFLAGS+=-I${NETBSDSRCDIR}/sys
diff -r 5729bbab2bac -r 7457bef9bf24 sbin/fsck_lfs/Makefile
--- a/sbin/fsck_lfs/Makefile    Thu Jun 06 00:53:35 2013 +0000
+++ b/sbin/fsck_lfs/Makefile    Thu Jun 06 00:54:49 2013 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.17 2009/08/06 00:51:55 pooka Exp $
+#      $NetBSD: Makefile,v 1.18 2013/06/06 00:54:49 dholland Exp $
 #      @(#)Makefile    8.1 (Berkeley) 6/5/93
 
 WARNS?=        3       # XXX: sign-compare issues
@@ -17,6 +17,9 @@
 CPPFLAGS+="-DKASSERT(x)="
 # -DVERBOSE_BLOCKMAP 
 
+# XXX
+CPPFLAGS+=-I${NETBSDSRCDIR}/sys
+
 LDADD+=-lutil
 DPADD+=${LIBUTIL}
 
diff -r 5729bbab2bac -r 7457bef9bf24 sbin/fsck_lfs/inode.c
--- a/sbin/fsck_lfs/inode.c     Thu Jun 06 00:53:35 2013 +0000
+++ b/sbin/fsck_lfs/inode.c     Thu Jun 06 00:54:49 2013 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: inode.c,v 1.44 2013/06/06 00:52:50 dholland Exp $   */
+/* $NetBSD: inode.c,v 1.45 2013/06/06 00:54:49 dholland Exp $   */
 
 /*-
  * Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -64,9 +64,10 @@
 #include <sys/buf.h>
 #include <sys/mount.h>
 
+#define vnode uvnode
+#define _SYS_VNODE_H_ /* XXX */
 #include <ufs/lfs/ulfs_inode.h>
 #include <ufs/lfs/ulfs_dir.h>
-#define vnode uvnode
 #include <ufs/lfs/lfs.h>
 #undef vnode
 
diff -r 5729bbab2bac -r 7457bef9bf24 sbin/fsck_lfs/lfs.c
--- a/sbin/fsck_lfs/lfs.c       Thu Jun 06 00:53:35 2013 +0000
+++ b/sbin/fsck_lfs/lfs.c       Thu Jun 06 00:54:49 2013 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: lfs.c,v 1.37 2013/06/06 00:52:50 dholland Exp $ */
+/* $NetBSD: lfs.c,v 1.38 2013/06/06 00:54:49 dholland Exp $ */
 /*-
  * Copyright (c) 2003 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -70,9 +70,10 @@
 #include <sys/buf.h>
 #include <sys/mount.h>
 
+#define vnode uvnode
+#define _SYS_VNODE_H_ /* XXX */
 #include <ufs/lfs/ulfs_inode.h>
 #include <ufs/lfs/ulfsmount.h>
-#define vnode uvnode
 #include <ufs/lfs/lfs.h>
 #undef vnode
 
diff -r 5729bbab2bac -r 7457bef9bf24 sbin/fsck_lfs/pass0.c
--- a/sbin/fsck_lfs/pass0.c     Thu Jun 06 00:53:35 2013 +0000
+++ b/sbin/fsck_lfs/pass0.c     Thu Jun 06 00:54:49 2013 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: pass0.c,v 1.33 2013/06/06 00:52:50 dholland Exp $   */
+/* $NetBSD: pass0.c,v 1.34 2013/06/06 00:54:49 dholland Exp $   */
 
 /*-
  * Copyright (c) 1999, 2000, 2001, 2002, 2003 The NetBSD Foundation, Inc.
@@ -63,9 +63,10 @@
 #include <sys/buf.h>
 #include <sys/mount.h>
 
+#define vnode uvnode
+#define _SYS_VNODE_H_ /* XXX */
 #include <ufs/lfs/ulfs_inode.h>
 #include <ufs/lfs/ulfs_dir.h>
-#define vnode uvnode
 #include <ufs/lfs/lfs.h>
 #undef vnode
 
diff -r 5729bbab2bac -r 7457bef9bf24 sbin/fsck_lfs/pass1.c
--- a/sbin/fsck_lfs/pass1.c     Thu Jun 06 00:53:35 2013 +0000
+++ b/sbin/fsck_lfs/pass1.c     Thu Jun 06 00:54:49 2013 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: pass1.c,v 1.32 2013/06/06 00:52:50 dholland Exp $   */
+/* $NetBSD: pass1.c,v 1.33 2013/06/06 00:54:49 dholland Exp $   */
 
 /*
  * Copyright (c) 1980, 1986, 1993
@@ -34,9 +34,10 @@
 #include <sys/mount.h>
 #include <sys/buf.h>
 
+#define vnode uvnode
+#define _SYS_VNODE_H_ /* XXX */
 #include <ufs/lfs/ulfs_inode.h>
 #include <ufs/lfs/ulfs_dir.h>
-#define vnode uvnode
 #include <ufs/lfs/lfs.h>
 #undef vnode
 
diff -r 5729bbab2bac -r 7457bef9bf24 sbin/fsck_lfs/pass3.c
--- a/sbin/fsck_lfs/pass3.c     Thu Jun 06 00:53:35 2013 +0000
+++ b/sbin/fsck_lfs/pass3.c     Thu Jun 06 00:54:49 2013 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: pass3.c,v 1.11 2013/06/06 00:52:50 dholland Exp $   */
+/* $NetBSD: pass3.c,v 1.12 2013/06/06 00:54:49 dholland Exp $   */
 
 /*
  * Copyright (c) 1980, 1986, 1993
@@ -31,8 +31,8 @@
 
 #include <sys/param.h>
 #include <sys/time.h>
+#include <sys/mount.h>
 #include <ufs/lfs/ulfs_dinode.h>
-#include <sys/mount.h>
 #include <ufs/lfs/lfs.h>
 #include "fsck.h"
 #include "extern.h"
diff -r 5729bbab2bac -r 7457bef9bf24 sbin/fsck_lfs/pass4.c
--- a/sbin/fsck_lfs/pass4.c     Thu Jun 06 00:53:35 2013 +0000
+++ b/sbin/fsck_lfs/pass4.c     Thu Jun 06 00:54:49 2013 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: pass4.c,v 1.19 2013/06/06 00:52:50 dholland Exp $   */
+/* $NetBSD: pass4.c,v 1.20 2013/06/06 00:54:49 dholland Exp $   */
 
 /*
  * Copyright (c) 1980, 1986, 1993
@@ -32,11 +32,12 @@
 #include <sys/param.h>
 #include <sys/time.h>
 #include <sys/mount.h>
-#include <ufs/lfs/ulfs_inode.h>
 
+#define _SYS_VNODE_H_ /* XXX */
 #define vnode uvnode
 #define buf ubuf
 #define panic call_panic
+#include <ufs/lfs/ulfs_inode.h>
 #include <ufs/lfs/lfs.h>
 
 #include <err.h>
diff -r 5729bbab2bac -r 7457bef9bf24 sbin/fsck_lfs/pass5.c
--- a/sbin/fsck_lfs/pass5.c     Thu Jun 06 00:53:35 2013 +0000
+++ b/sbin/fsck_lfs/pass5.c     Thu Jun 06 00:54:49 2013 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: pass5.c,v 1.25 2013/06/06 00:52:50 dholland Exp $   */
+/* $NetBSD: pass5.c,v 1.26 2013/06/06 00:54:49 dholland Exp $   */
 
 /*-
  * Copyright (c) 2000, 2003 The NetBSD Foundation, Inc.
@@ -35,10 +35,11 @@
 #include <sys/buf.h>
 #include <sys/mount.h>
 
+#define _SYS_VNODE_H_ /* XXX */
+#define vnode uvnode
 #include <ufs/lfs/ulfsmount.h>
 #include <ufs/lfs/ulfs_inode.h>
 #include <ufs/lfs/ulfs_dir.h>
-#define vnode uvnode
 #include <ufs/lfs/lfs.h>
 #undef vnode
 
diff -r 5729bbab2bac -r 7457bef9bf24 sbin/fsck_lfs/pass6.c
--- a/sbin/fsck_lfs/pass6.c     Thu Jun 06 00:53:35 2013 +0000
+++ b/sbin/fsck_lfs/pass6.c     Thu Jun 06 00:54:49 2013 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: pass6.c,v 1.26 2013/06/06 00:52:50 dholland Exp $   */
+/* $NetBSD: pass6.c,v 1.27 2013/06/06 00:54:49 dholland Exp $   */
 
 /*-
  * Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -35,10 +35,12 @@
 #include <sys/buf.h>
 #include <sys/mount.h>
 
+#define _SYS_VNODE_H_ /* XXX */
+#define VU_DIROP 0x01000000 /* XXX XXX from sys/vnode.h */
+#define vnode uvnode
 #include <ufs/lfs/ulfsmount.h>
 #include <ufs/lfs/ulfs_inode.h>
 #include <ufs/lfs/ulfs_dir.h>
-#define vnode uvnode
 #include <ufs/lfs/lfs.h>
 #undef vnode
 
diff -r 5729bbab2bac -r 7457bef9bf24 sbin/fsck_lfs/segwrite.c
--- a/sbin/fsck_lfs/segwrite.c  Thu Jun 06 00:53:35 2013 +0000
+++ b/sbin/fsck_lfs/segwrite.c  Thu Jun 06 00:54:49 2013 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: segwrite.c,v 1.22 2013/06/06 00:52:50 dholland Exp $ */
+/* $NetBSD: segwrite.c,v 1.23 2013/06/06 00:54:49 dholland Exp $ */
 /*-
  * Copyright (c) 2003 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -67,14 +67,15 @@
 #include <sys/buf.h>
 #include <sys/mount.h>
 
-#include <ufs/lfs/ulfs_inode.h>
-#include <ufs/lfs/ulfsmount.h>
-
 /* Override certain things to make <ufs/lfs/lfs.h> work */
+#define _SYS_VNODE_H_ /* XXX */
+#define VU_DIROP 0x01000000 /* XXX XXX from sys/vnode.h */
 #define vnode uvnode
 #define buf ubuf
 #define panic call_panic
 
+#include <ufs/lfs/ulfs_inode.h>
+#include <ufs/lfs/ulfsmount.h>
 #include <ufs/lfs/lfs.h>
 
 #include <assert.h>
diff -r 5729bbab2bac -r 7457bef9bf24 sbin/fsck_lfs/setup.c
--- a/sbin/fsck_lfs/setup.c     Thu Jun 06 00:53:35 2013 +0000
+++ b/sbin/fsck_lfs/setup.c     Thu Jun 06 00:54:49 2013 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: setup.c,v 1.40 2013/06/06 00:52:50 dholland Exp $ */
+/* $NetBSD: setup.c,v 1.41 2013/06/06 00:54:49 dholland Exp $ */
 
 /*-
  * Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -71,9 +71,10 @@
 #include <sys/disk.h>
 #include <sys/file.h>
 
+#define _SYS_VNODE_H_ /* XXX */
+#define vnode uvnode
 #include <ufs/lfs/ulfs_inode.h>
 #include <ufs/lfs/ulfsmount.h>
-#define vnode uvnode
 #include <ufs/lfs/lfs.h>
 #undef vnode
 
diff -r 5729bbab2bac -r 7457bef9bf24 sbin/fsck_lfs/vars.c
--- a/sbin/fsck_lfs/vars.c      Thu Jun 06 00:53:35 2013 +0000
+++ b/sbin/fsck_lfs/vars.c      Thu Jun 06 00:54:49 2013 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: vars.c,v 1.15 2013/06/06 00:52:50 dholland Exp $    */
+/* $NetBSD: vars.c,v 1.16 2013/06/06 00:54:49 dholland Exp $    */
 /*-
  * Copyright (c) 1999, 2000, 2001, 2002, 2003 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -30,9 +30,9 @@
 
 #include <sys/param.h>
 #include <sys/time.h>
+#include <sys/mount.h>         /* XXX */
 #include <ufs/lfs/ulfs_dinode.h>
 #include <ufs/lfs/ulfs_dir.h>
-#include <sys/mount.h>         /* XXX */
 #include <ufs/lfs/lfs.h>
 #include "fsck.h"
 
diff -r 5729bbab2bac -r 7457bef9bf24 sbin/fsck_lfs/vnode.c
--- a/sbin/fsck_lfs/vnode.c     Thu Jun 06 00:53:35 2013 +0000
+++ b/sbin/fsck_lfs/vnode.c     Thu Jun 06 00:54:49 2013 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: vnode.c,v 1.12 2013/06/06 00:52:50 dholland Exp $ */
+/* $NetBSD: vnode.c,v 1.13 2013/06/06 00:54:49 dholland Exp $ */
Prev by Date: [src/trunk]: src/sbin/newfs_lfs ufs -> ulfs for newfs_lfs
Next by Date: [src/trunk]: src/sys/ufs/lfs Remove references to Apple UFS.
Previous by Thread: [src/trunk]: src/sbin/newfs_lfs ufs -> ulfs for newfs_lfs
Next by Thread: [src/trunk]: src/sys/ufs/lfs Remove references to Apple UFS.
Indexes:
Home | Main Index | Thread Index | Old Index