Module Name: src
Committed By: dholland
Date: Sat Jun 8 02:16:03 UTC 2013
Modified Files:
src/libexec/lfs_cleanerd: Makefile
src/sbin/fsck_lfs: Makefile dir.c inode.c lfs.c main.c pass0.c pass1.c
pass2.c pass3.c pass4.c pass5.c pass6.c segwrite.c setup.c
utilities.c vars.c vnode.c
src/sbin/newfs_lfs: Makefile make_lfs.c newfs.c
src/sys/ufs/lfs: lfs_itimes.c
Log Message:
Tidy up the LFS userland build hacks.
Don't use -I${NETBSDSRCDIR}/sys; don't include files other than the
exported LFS headers, which are lfs.h, lfs_inode.h, and (for now)
lfs_extern.h.
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/libexec/lfs_cleanerd/Makefile
cvs rdiff -u -r1.18 -r1.19 src/sbin/fsck_lfs/Makefile
cvs rdiff -u -r1.30 -r1.31 src/sbin/fsck_lfs/dir.c
cvs rdiff -u -r1.49 -r1.50 src/sbin/fsck_lfs/inode.c
cvs rdiff -u -r1.38 -r1.39 src/sbin/fsck_lfs/lfs.c
cvs rdiff -u -r1.44 -r1.45 src/sbin/fsck_lfs/main.c
cvs rdiff -u -r1.34 -r1.35 src/sbin/fsck_lfs/pass0.c \
src/sbin/fsck_lfs/utilities.c
cvs rdiff -u -r1.35 -r1.36 src/sbin/fsck_lfs/pass1.c
cvs rdiff -u -r1.22 -r1.23 src/sbin/fsck_lfs/pass2.c
cvs rdiff -u -r1.12 -r1.13 src/sbin/fsck_lfs/pass3.c
cvs rdiff -u -r1.20 -r1.21 src/sbin/fsck_lfs/pass4.c
cvs rdiff -u -r1.26 -r1.27 src/sbin/fsck_lfs/pass5.c
cvs rdiff -u -r1.28 -r1.29 src/sbin/fsck_lfs/pass6.c
cvs rdiff -u -r1.24 -r1.25 src/sbin/fsck_lfs/segwrite.c
cvs rdiff -u -r1.42 -r1.43 src/sbin/fsck_lfs/setup.c
cvs rdiff -u -r1.16 -r1.17 src/sbin/fsck_lfs/vars.c
cvs rdiff -u -r1.13 -r1.14 src/sbin/fsck_lfs/vnode.c
cvs rdiff -u -r1.10 -r1.11 src/sbin/newfs_lfs/Makefile
cvs rdiff -u -r1.26 -r1.27 src/sbin/newfs_lfs/make_lfs.c
cvs rdiff -u -r1.27 -r1.28 src/sbin/newfs_lfs/newfs.c
cvs rdiff -u -r1.14 -r1.15 src/sys/ufs/lfs/lfs_itimes.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/libexec/lfs_cleanerd/Makefile
diff -u src/libexec/lfs_cleanerd/Makefile:1.16 src/libexec/lfs_cleanerd/Makefile:1.17
--- src/libexec/lfs_cleanerd/Makefile:1.16 Thu Jun 6 00:54:49 2013
+++ src/libexec/lfs_cleanerd/Makefile Sat Jun 8 02:16:03 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2013/06/06 00:54:49 dholland Exp $
+# $NetBSD: Makefile,v 1.17 2013/06/08 02:16:03 dholland Exp $
# @(#)Makefile 8.1 (Berkeley) 6/18/93
.include "Makefile.inc"
@@ -6,9 +6,6 @@
PROG= lfs_cleanerd
MAN= lfs_cleanerd.8
-# XXX
-CPPFLAGS+=-I${NETBSDSRCDIR}/sys
-
BINDIR= /libexec
.if (${MKDYNAMICROOT} == "no")
LDSTATIC?= -static
Index: src/sbin/fsck_lfs/Makefile
diff -u src/sbin/fsck_lfs/Makefile:1.18 src/sbin/fsck_lfs/Makefile:1.19
--- src/sbin/fsck_lfs/Makefile:1.18 Thu Jun 6 00:54:49 2013
+++ src/sbin/fsck_lfs/Makefile Sat Jun 8 02:16:03 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2013/06/06 00:54:49 dholland Exp $
+# $NetBSD: Makefile,v 1.19 2013/06/08 02:16:03 dholland Exp $
# @(#)Makefile 8.1 (Berkeley) 6/5/93
WARNS?= 3 # XXX: sign-compare issues
@@ -17,9 +17,6 @@ CPPFLAGS+=-I${.CURDIR} -I${FSCK} -DIN_FS
CPPFLAGS+="-DKASSERT(x)="
# -DVERBOSE_BLOCKMAP
-# XXX
-CPPFLAGS+=-I${NETBSDSRCDIR}/sys
-
LDADD+=-lutil
DPADD+=${LIBUTIL}
Index: src/sbin/fsck_lfs/dir.c
diff -u src/sbin/fsck_lfs/dir.c:1.30 src/sbin/fsck_lfs/dir.c:1.31
--- src/sbin/fsck_lfs/dir.c:1.30 Sat Jun 8 02:14:46 2013
+++ src/sbin/fsck_lfs/dir.c Sat Jun 8 02:16:03 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: dir.c,v 1.30 2013/06/08 02:14:46 dholland Exp $ */
+/* $NetBSD: dir.c,v 1.31 2013/06/08 02:16:03 dholland Exp $ */
/*
* Copyright (c) 1980, 1986, 1993
@@ -35,10 +35,8 @@
#include <sys/buf.h>
#include <sys/mount.h>
-#include <ufs/lfs/ulfs_inode.h>
-#include <ufs/lfs/ulfs_dir.h>
-#include <ufs/lfs/ulfsmount.h>
#include <ufs/lfs/lfs.h>
+#include <ufs/lfs/lfs_inode.h>
#include <err.h>
#include <stdio.h>
Index: src/sbin/fsck_lfs/inode.c
diff -u src/sbin/fsck_lfs/inode.c:1.49 src/sbin/fsck_lfs/inode.c:1.50
--- src/sbin/fsck_lfs/inode.c:1.49 Sat Jun 8 02:14:46 2013
+++ src/sbin/fsck_lfs/inode.c Sat Jun 8 02:16:03 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: inode.c,v 1.49 2013/06/08 02:14:46 dholland Exp $ */
+/* $NetBSD: inode.c,v 1.50 2013/06/08 02:16:03 dholland Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -65,10 +65,8 @@
#include <sys/mount.h>
#define vnode uvnode
-#define _SYS_VNODE_H_ /* XXX */
-#include <ufs/lfs/ulfs_inode.h>
-#include <ufs/lfs/ulfs_dir.h>
#include <ufs/lfs/lfs.h>
+#include <ufs/lfs/lfs_inode.h>
#undef vnode
#include <err.h>
Index: src/sbin/fsck_lfs/lfs.c
diff -u src/sbin/fsck_lfs/lfs.c:1.38 src/sbin/fsck_lfs/lfs.c:1.39
--- src/sbin/fsck_lfs/lfs.c:1.38 Thu Jun 6 00:54:49 2013
+++ src/sbin/fsck_lfs/lfs.c Sat Jun 8 02:16:03 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: lfs.c,v 1.38 2013/06/06 00:54:49 dholland Exp $ */
+/* $NetBSD: lfs.c,v 1.39 2013/06/08 02:16:03 dholland Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -71,10 +71,8 @@
#include <sys/mount.h>
#define vnode uvnode
-#define _SYS_VNODE_H_ /* XXX */
-#include <ufs/lfs/ulfs_inode.h>
-#include <ufs/lfs/ulfsmount.h>
#include <ufs/lfs/lfs.h>
+#include <ufs/lfs/lfs_inode.h>
#undef vnode
#include <assert.h>
Index: src/sbin/fsck_lfs/main.c
diff -u src/sbin/fsck_lfs/main.c:1.44 src/sbin/fsck_lfs/main.c:1.45
--- src/sbin/fsck_lfs/main.c:1.44 Thu Jun 6 00:52:50 2013
+++ src/sbin/fsck_lfs/main.c Sat Jun 8 02:16:03 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.44 2013/06/06 00:52:50 dholland Exp $ */
+/* $NetBSD: main.c,v 1.45 2013/06/08 02:16:03 dholland Exp $ */
/*
* Copyright (c) 1980, 1986, 1993
@@ -32,8 +32,6 @@
#include <sys/param.h>
#include <sys/time.h>
#include <sys/mount.h>
-#include <ufs/lfs/ulfs_dinode.h>
-#include <ufs/lfs/ulfsmount.h>
#include <ufs/lfs/lfs.h>
#include <fstab.h>
Index: src/sbin/fsck_lfs/pass0.c
diff -u src/sbin/fsck_lfs/pass0.c:1.34 src/sbin/fsck_lfs/pass0.c:1.35
--- src/sbin/fsck_lfs/pass0.c:1.34 Thu Jun 6 00:54:49 2013
+++ src/sbin/fsck_lfs/pass0.c Sat Jun 8 02:16:03 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: pass0.c,v 1.34 2013/06/06 00:54:49 dholland Exp $ */
+/* $NetBSD: pass0.c,v 1.35 2013/06/08 02:16:03 dholland Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001, 2002, 2003 The NetBSD Foundation, Inc.
@@ -64,10 +64,8 @@
#include <sys/mount.h>
#define vnode uvnode
-#define _SYS_VNODE_H_ /* XXX */
-#include <ufs/lfs/ulfs_inode.h>
-#include <ufs/lfs/ulfs_dir.h>
#include <ufs/lfs/lfs.h>
+#include <ufs/lfs/lfs_inode.h>
#undef vnode
#include <assert.h>
Index: src/sbin/fsck_lfs/utilities.c
diff -u src/sbin/fsck_lfs/utilities.c:1.34 src/sbin/fsck_lfs/utilities.c:1.35
--- src/sbin/fsck_lfs/utilities.c:1.34 Sat Jun 8 02:11:11 2013
+++ src/sbin/fsck_lfs/utilities.c Sat Jun 8 02:16:03 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: utilities.c,v 1.34 2013/06/08 02:11:11 dholland Exp $ */
+/* $NetBSD: utilities.c,v 1.35 2013/06/08 02:16:03 dholland Exp $ */
/*
* Copyright (c) 1980, 1986, 1993
@@ -33,8 +33,6 @@
#include <sys/time.h>
#include <sys/mount.h>
-#include <ufs/lfs/ulfs_inode.h>
-#include <ufs/lfs/ulfs_dir.h>
#define buf ubuf
#define vnode uvnode
#include <ufs/lfs/lfs.h>
Index: src/sbin/fsck_lfs/pass1.c
diff -u src/sbin/fsck_lfs/pass1.c:1.35 src/sbin/fsck_lfs/pass1.c:1.36
--- src/sbin/fsck_lfs/pass1.c:1.35 Sat Jun 8 02:14:46 2013
+++ src/sbin/fsck_lfs/pass1.c Sat Jun 8 02:16:03 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: pass1.c,v 1.35 2013/06/08 02:14:46 dholland Exp $ */
+/* $NetBSD: pass1.c,v 1.36 2013/06/08 02:16:03 dholland Exp $ */
/*
* Copyright (c) 1980, 1986, 1993
@@ -35,10 +35,8 @@
#include <sys/buf.h>
#define vnode uvnode
-#define _SYS_VNODE_H_ /* XXX */
-#include <ufs/lfs/ulfs_inode.h>
-#include <ufs/lfs/ulfs_dir.h>
#include <ufs/lfs/lfs.h>
+#include <ufs/lfs/lfs_inode.h>
#undef vnode
#include <err.h>
Index: src/sbin/fsck_lfs/pass2.c
diff -u src/sbin/fsck_lfs/pass2.c:1.22 src/sbin/fsck_lfs/pass2.c:1.23
--- src/sbin/fsck_lfs/pass2.c:1.22 Sat Jun 8 02:14:46 2013
+++ src/sbin/fsck_lfs/pass2.c Sat Jun 8 02:16:03 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: pass2.c,v 1.22 2013/06/08 02:14:46 dholland Exp $ */
+/* $NetBSD: pass2.c,v 1.23 2013/06/08 02:16:03 dholland Exp $ */
/*
* Copyright (c) 1980, 1986, 1993
@@ -35,9 +35,8 @@
#include <sys/mount.h>
#include <sys/buf.h>
-#include <ufs/lfs/ulfs_inode.h>
-#include <ufs/lfs/ulfs_dir.h>
#include <ufs/lfs/lfs.h>
+#include <ufs/lfs/lfs_inode.h>
#include <err.h>
#include <stdio.h>
Index: src/sbin/fsck_lfs/pass3.c
diff -u src/sbin/fsck_lfs/pass3.c:1.12 src/sbin/fsck_lfs/pass3.c:1.13
--- src/sbin/fsck_lfs/pass3.c:1.12 Thu Jun 6 00:54:49 2013
+++ src/sbin/fsck_lfs/pass3.c Sat Jun 8 02:16:03 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: pass3.c,v 1.12 2013/06/06 00:54:49 dholland Exp $ */
+/* $NetBSD: pass3.c,v 1.13 2013/06/08 02:16:03 dholland Exp $ */
/*
* Copyright (c) 1980, 1986, 1993
@@ -32,7 +32,6 @@
#include <sys/param.h>
#include <sys/time.h>
#include <sys/mount.h>
-#include <ufs/lfs/ulfs_dinode.h>
#include <ufs/lfs/lfs.h>
#include "fsck.h"
#include "extern.h"
Index: src/sbin/fsck_lfs/pass4.c
diff -u src/sbin/fsck_lfs/pass4.c:1.20 src/sbin/fsck_lfs/pass4.c:1.21
--- src/sbin/fsck_lfs/pass4.c:1.20 Thu Jun 6 00:54:49 2013
+++ src/sbin/fsck_lfs/pass4.c Sat Jun 8 02:16:03 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: pass4.c,v 1.20 2013/06/06 00:54:49 dholland Exp $ */
+/* $NetBSD: pass4.c,v 1.21 2013/06/08 02:16:03 dholland Exp $ */
/*
* Copyright (c) 1980, 1986, 1993
@@ -33,12 +33,11 @@
#include <sys/time.h>
#include <sys/mount.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 <ufs/lfs/lfs_inode.h>
#include <err.h>
#include <stdlib.h>
Index: src/sbin/fsck_lfs/pass5.c
diff -u src/sbin/fsck_lfs/pass5.c:1.26 src/sbin/fsck_lfs/pass5.c:1.27
--- src/sbin/fsck_lfs/pass5.c:1.26 Thu Jun 6 00:54:49 2013
+++ src/sbin/fsck_lfs/pass5.c Sat Jun 8 02:16:03 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: pass5.c,v 1.26 2013/06/06 00:54:49 dholland Exp $ */
+/* $NetBSD: pass5.c,v 1.27 2013/06/08 02:16:03 dholland Exp $ */
/*-
* Copyright (c) 2000, 2003 The NetBSD Foundation, Inc.
@@ -35,12 +35,9 @@
#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>
#include <ufs/lfs/lfs.h>
+#include <ufs/lfs/lfs_inode.h>
#undef vnode
#include <string.h>
Index: src/sbin/fsck_lfs/pass6.c
diff -u src/sbin/fsck_lfs/pass6.c:1.28 src/sbin/fsck_lfs/pass6.c:1.29
--- src/sbin/fsck_lfs/pass6.c:1.28 Sat Jun 8 02:09:35 2013
+++ src/sbin/fsck_lfs/pass6.c Sat Jun 8 02:16:03 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: pass6.c,v 1.28 2013/06/08 02:09:35 dholland Exp $ */
+/* $NetBSD: pass6.c,v 1.29 2013/06/08 02:16:03 dholland Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -35,13 +35,10 @@
#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>
#include <ufs/lfs/lfs.h>
+#include <ufs/lfs/lfs_inode.h>
#undef vnode
#include <assert.h>
Index: src/sbin/fsck_lfs/segwrite.c
diff -u src/sbin/fsck_lfs/segwrite.c:1.24 src/sbin/fsck_lfs/segwrite.c:1.25
--- src/sbin/fsck_lfs/segwrite.c:1.24 Sat Jun 8 02:09:35 2013
+++ src/sbin/fsck_lfs/segwrite.c Sat Jun 8 02:16:03 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: segwrite.c,v 1.24 2013/06/08 02:09:35 dholland Exp $ */
+/* $NetBSD: segwrite.c,v 1.25 2013/06/08 02:16:03 dholland Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -68,15 +68,13 @@
#include <sys/mount.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 <ufs/lfs/lfs_inode.h>
#include <assert.h>
#include <stdio.h>
Index: src/sbin/fsck_lfs/setup.c
diff -u src/sbin/fsck_lfs/setup.c:1.42 src/sbin/fsck_lfs/setup.c:1.43
--- src/sbin/fsck_lfs/setup.c:1.42 Sat Jun 8 02:09:35 2013
+++ src/sbin/fsck_lfs/setup.c Sat Jun 8 02:16:03 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: setup.c,v 1.42 2013/06/08 02:09:35 dholland Exp $ */
+/* $NetBSD: setup.c,v 1.43 2013/06/08 02:16:03 dholland Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -71,11 +71,9 @@
#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>
#include <ufs/lfs/lfs.h>
+#include <ufs/lfs/lfs_inode.h>
#undef vnode
#include <ctype.h>
Index: src/sbin/fsck_lfs/vars.c
diff -u src/sbin/fsck_lfs/vars.c:1.16 src/sbin/fsck_lfs/vars.c:1.17
--- src/sbin/fsck_lfs/vars.c:1.16 Thu Jun 6 00:54:49 2013
+++ src/sbin/fsck_lfs/vars.c Sat Jun 8 02:16:03 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: vars.c,v 1.16 2013/06/06 00:54:49 dholland Exp $ */
+/* $NetBSD: vars.c,v 1.17 2013/06/08 02:16:03 dholland Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001, 2002, 2003 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -31,8 +31,6 @@
#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 <ufs/lfs/lfs.h>
#include "fsck.h"
Index: src/sbin/fsck_lfs/vnode.c
diff -u src/sbin/fsck_lfs/vnode.c:1.13 src/sbin/fsck_lfs/vnode.c:1.14
--- src/sbin/fsck_lfs/vnode.c:1.13 Thu Jun 6 00:54:49 2013
+++ src/sbin/fsck_lfs/vnode.c Sat Jun 8 02:16:03 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: vnode.c,v 1.13 2013/06/06 00:54:49 dholland Exp $ */
+/* $NetBSD: vnode.c,v 1.14 2013/06/08 02:16:03 dholland Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -35,12 +35,10 @@
#include <sys/mount.h>
#include <sys/queue.h>
-#define _SYS_VNODE_H_ /* XXX */
#define VU_DIROP 0x01000000 /* XXX XXX from sys/vnode.h */
#define vnode uvnode
-#include <ufs/lfs/ulfs_inode.h>
-#include <ufs/lfs/ulfsmount.h>
#include <ufs/lfs/lfs.h>
+#include <ufs/lfs/lfs_inode.h>
#undef vnode
#include <assert.h>
Index: src/sbin/newfs_lfs/Makefile
diff -u src/sbin/newfs_lfs/Makefile:1.10 src/sbin/newfs_lfs/Makefile:1.11
--- src/sbin/newfs_lfs/Makefile:1.10 Thu Jun 6 00:54:49 2013
+++ src/sbin/newfs_lfs/Makefile Sat Jun 8 02:16:03 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2013/06/06 00:54:49 dholland Exp $
+# $NetBSD: Makefile,v 1.11 2013/06/08 02:16:03 dholland Exp $
# @(#)Makefile 8.1 (Berkeley) 6/18/93
WARNS?= 3 # XXX: sign-compare issues
@@ -26,7 +26,4 @@ DPADD+=${LIBPROP}
CPPFLAGS+=-I${FSCK_LFS} -I${FSCK} "-Dmutex_enter(x)=" "-Dmutex_exit(x)=" # -DNDEBUG # -DVERBOSE_BLOCKMAP
CPPFLAGS+="-DKASSERT(x)="
-# XXX
-CPPFLAGS+=-I${NETBSDSRCDIR}/sys
-
.include <bsd.prog.mk>
Index: src/sbin/newfs_lfs/make_lfs.c
diff -u src/sbin/newfs_lfs/make_lfs.c:1.26 src/sbin/newfs_lfs/make_lfs.c:1.27
--- src/sbin/newfs_lfs/make_lfs.c:1.26 Sat Jun 8 02:14:46 2013
+++ src/sbin/newfs_lfs/make_lfs.c Sat Jun 8 02:16:03 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: make_lfs.c,v 1.26 2013/06/08 02:14:46 dholland Exp $ */
+/* $NetBSD: make_lfs.c,v 1.27 2013/06/08 02:16:03 dholland Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -62,7 +62,7 @@
#if 0
static char sccsid[] = "@(#)lfs.c 8.5 (Berkeley) 5/24/95";
#else
-__RCSID("$NetBSD: make_lfs.c,v 1.26 2013/06/08 02:14:46 dholland Exp $");
+__RCSID("$NetBSD: make_lfs.c,v 1.27 2013/06/08 02:16:03 dholland Exp $");
#endif
#endif /* not lint */
@@ -73,7 +73,6 @@ __RCSID("$NetBSD: make_lfs.c,v 1.26 2013
#include <sys/stat.h>
/* Override certain things to make <ufs/lfs/lfs.h> work */
-#define _SYS_VNODE_H_ /* XXX */
# undef simple_lock
# define simple_lock(x)
# undef simple_unlock
@@ -81,10 +80,8 @@ __RCSID("$NetBSD: make_lfs.c,v 1.26 2013
# define vnode uvnode
# define buf ubuf
# define panic call_panic
-#include <ufs/lfs/ulfs_dir.h>
-#include <ufs/lfs/ulfs_quotacommon.h>
-#include <ufs/lfs/ulfs_inode.h>
#include <ufs/lfs/lfs.h>
+#include <ufs/lfs/lfs_inode.h>
#include <err.h>
#include <errno.h>
@@ -615,7 +612,7 @@ make_lfs(int devfd, uint secsize, struct
if (dip == NULL)
err(1, NULL);
memset(dip, 0, sizeof(*dip));
- dip->di_mode = LFS_IFREG|IREAD|IWRITE;
+ dip->di_mode = LFS_IFREG | 0600;
dip->di_flags = SF_IMMUTABLE;
make_dinode(LFS_IFILE_INUM, dip,
blkstofrags(fs, fs->lfs_cleansz + fs->lfs_segtabsz + 1), fs);
Index: src/sbin/newfs_lfs/newfs.c
diff -u src/sbin/newfs_lfs/newfs.c:1.27 src/sbin/newfs_lfs/newfs.c:1.28
--- src/sbin/newfs_lfs/newfs.c:1.27 Thu Jun 6 00:53:12 2013
+++ src/sbin/newfs_lfs/newfs.c Sat Jun 8 02:16:03 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: newfs.c,v 1.27 2013/06/06 00:53:12 dholland Exp $ */
+/* $NetBSD: newfs.c,v 1.28 2013/06/08 02:16:03 dholland Exp $ */
/*-
* Copyright (c) 1989, 1992, 1993
@@ -39,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1989, 19
#if 0
static char sccsid[] = "@(#)newfs.c 8.5 (Berkeley) 5/24/95";
#else
-__RCSID("$NetBSD: newfs.c,v 1.27 2013/06/06 00:53:12 dholland Exp $");
+__RCSID("$NetBSD: newfs.c,v 1.28 2013/06/08 02:16:03 dholland Exp $");
#endif
#endif /* not lint */
@@ -56,8 +56,6 @@ __RCSID("$NetBSD: newfs.c,v 1.27 2013/06
#include <sys/time.h>
#include <sys/disk.h>
-#include <ufs/lfs/ulfs_dir.h>
-#include <ufs/lfs/ulfs_dinode.h>
#include <ufs/lfs/lfs.h>
#include <err.h>
Index: src/sys/ufs/lfs/lfs_itimes.c
diff -u src/sys/ufs/lfs/lfs_itimes.c:1.14 src/sys/ufs/lfs/lfs_itimes.c:1.15
--- src/sys/ufs/lfs/lfs_itimes.c:1.14 Thu Jun 6 00:54:49 2013
+++ src/sys/ufs/lfs/lfs_itimes.c Sat Jun 8 02:16:03 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: lfs_itimes.c,v 1.14 2013/06/06 00:54:49 dholland Exp $ */
+/* $NetBSD: lfs_itimes.c,v 1.15 2013/06/08 02:16:03 dholland Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001, 2002, 2003 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lfs_itimes.c,v 1.14 2013/06/06 00:54:49 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lfs_itimes.c,v 1.15 2013/06/08 02:16:03 dholland Exp $");
#include <sys/param.h>
#include <sys/time.h>
@@ -43,15 +43,14 @@ __KERNEL_RCSID(0, "$NetBSD: lfs_itimes.c
#define vnode uvnode
#define buf ubuf
#define panic call_panic
-// XXX
-#define _SYS_VNODE_H_
#else
+#include <ufs/lfs/ulfs_inode.h>
#include <ufs/lfs/lfs_extern.h>
#include <sys/kauth.h>
#endif
-#include <ufs/lfs/ulfs_inode.h>
#include <ufs/lfs/lfs.h>
+#include <ufs/lfs/lfs_inode.h>
void
lfs_itimes(struct inode *ip, const struct timespec *acc,
