Module Name: src
Committed By: dholland
Date: Thu Jun 6 00:54:49 UTC 2013
Modified Files:
src/libexec/lfs_cleanerd: Makefile Makefile.inc
src/sbin/fsck_lfs: Makefile inode.c lfs.c pass0.c pass1.c pass3.c
pass4.c pass5.c pass6.c segwrite.c setup.c vars.c vnode.c
src/sbin/newfs_lfs: Makefile make_lfs.c
src/sys/rump/fs/lib/liblfs: Makefile
src/sys/ufs/lfs: lfs_cksum.c lfs_itimes.c ulfs_quota.c
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/libexec/lfs_cleanerd/Makefile
cvs rdiff -u -r1.3 -r1.4 src/libexec/lfs_cleanerd/Makefile.inc
cvs rdiff -u -r1.17 -r1.18 src/sbin/fsck_lfs/Makefile
cvs rdiff -u -r1.44 -r1.45 src/sbin/fsck_lfs/inode.c
cvs rdiff -u -r1.37 -r1.38 src/sbin/fsck_lfs/lfs.c
cvs rdiff -u -r1.33 -r1.34 src/sbin/fsck_lfs/pass0.c
cvs rdiff -u -r1.32 -r1.33 src/sbin/fsck_lfs/pass1.c
cvs rdiff -u -r1.11 -r1.12 src/sbin/fsck_lfs/pass3.c
cvs rdiff -u -r1.19 -r1.20 src/sbin/fsck_lfs/pass4.c
cvs rdiff -u -r1.25 -r1.26 src/sbin/fsck_lfs/pass5.c
cvs rdiff -u -r1.26 -r1.27 src/sbin/fsck_lfs/pass6.c
cvs rdiff -u -r1.22 -r1.23 src/sbin/fsck_lfs/segwrite.c
cvs rdiff -u -r1.40 -r1.41 src/sbin/fsck_lfs/setup.c
cvs rdiff -u -r1.15 -r1.16 src/sbin/fsck_lfs/vars.c
cvs rdiff -u -r1.12 -r1.13 src/sbin/fsck_lfs/vnode.c
cvs rdiff -u -r1.9 -r1.10 src/sbin/newfs_lfs/Makefile
cvs rdiff -u -r1.21 -r1.22 src/sbin/newfs_lfs/make_lfs.c
cvs rdiff -u -r1.6 -r1.7 src/sys/rump/fs/lib/liblfs/Makefile
cvs rdiff -u -r1.28 -r1.29 src/sys/ufs/lfs/lfs_cksum.c
cvs rdiff -u -r1.13 -r1.14 src/sys/ufs/lfs/lfs_itimes.c
cvs rdiff -u -r1.5 -r1.6 src/sys/ufs/lfs/ulfs_quota.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.15 src/libexec/lfs_cleanerd/Makefile:1.16
--- src/libexec/lfs_cleanerd/Makefile:1.15 Thu Aug 6 00:51:55 2009
+++ src/libexec/lfs_cleanerd/Makefile Thu Jun 6 00:54:49 2013
@@ -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
Index: src/libexec/lfs_cleanerd/Makefile.inc
diff -u src/libexec/lfs_cleanerd/Makefile.inc:1.3 src/libexec/lfs_cleanerd/Makefile.inc:1.4
--- src/libexec/lfs_cleanerd/Makefile.inc:1.3 Wed Jul 28 22:35:52 2010
+++ src/libexec/lfs_cleanerd/Makefile.inc Thu Jun 6 00:54:49 2013
@@ -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+="-Dmutex_enter(x)=" "-Dmutex_e
CPPFLAGS+="-DKASSERT(x)="
#CPPFLAGS+=-DREPAIR_ZERO_FINFO
#CPPFLAGS+=-DTEST_PATTERN
+
+# XXX
+CPPFLAGS+=-I${NETBSDSRCDIR}/sys
Index: src/sbin/fsck_lfs/Makefile
diff -u src/sbin/fsck_lfs/Makefile:1.17 src/sbin/fsck_lfs/Makefile:1.18
--- src/sbin/fsck_lfs/Makefile:1.17 Thu Aug 6 00:51:55 2009
+++ src/sbin/fsck_lfs/Makefile Thu Jun 6 00:54:49 2013
@@ -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+=-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/inode.c
diff -u src/sbin/fsck_lfs/inode.c:1.44 src/sbin/fsck_lfs/inode.c:1.45
--- src/sbin/fsck_lfs/inode.c:1.44 Thu Jun 6 00:52:50 2013
+++ src/sbin/fsck_lfs/inode.c Thu Jun 6 00:54:49 2013
@@ -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
Index: src/sbin/fsck_lfs/lfs.c
diff -u src/sbin/fsck_lfs/lfs.c:1.37 src/sbin/fsck_lfs/lfs.c:1.38
--- src/sbin/fsck_lfs/lfs.c:1.37 Thu Jun 6 00:52:50 2013
+++ src/sbin/fsck_lfs/lfs.c Thu Jun 6 00:54:49 2013
@@ -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
Index: src/sbin/fsck_lfs/pass0.c
diff -u src/sbin/fsck_lfs/pass0.c:1.33 src/sbin/fsck_lfs/pass0.c:1.34
--- src/sbin/fsck_lfs/pass0.c:1.33 Thu Jun 6 00:52:50 2013
+++ src/sbin/fsck_lfs/pass0.c Thu Jun 6 00:54:49 2013
@@ -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
Index: src/sbin/fsck_lfs/pass1.c
diff -u src/sbin/fsck_lfs/pass1.c:1.32 src/sbin/fsck_lfs/pass1.c:1.33
--- src/sbin/fsck_lfs/pass1.c:1.32 Thu Jun 6 00:52:50 2013
+++ src/sbin/fsck_lfs/pass1.c Thu Jun 6 00:54:49 2013
@@ -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
Index: src/sbin/fsck_lfs/pass3.c
diff -u src/sbin/fsck_lfs/pass3.c:1.11 src/sbin/fsck_lfs/pass3.c:1.12
--- src/sbin/fsck_lfs/pass3.c:1.11 Thu Jun 6 00:52:50 2013
+++ src/sbin/fsck_lfs/pass3.c Thu Jun 6 00:54:49 2013
@@ -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 <ufs/lfs/ulfs_dinode.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.19 src/sbin/fsck_lfs/pass4.c:1.20
--- src/sbin/fsck_lfs/pass4.c:1.19 Thu Jun 6 00:52:50 2013
+++ src/sbin/fsck_lfs/pass4.c Thu Jun 6 00:54:49 2013
@@ -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>
Index: src/sbin/fsck_lfs/pass5.c
diff -u src/sbin/fsck_lfs/pass5.c:1.25 src/sbin/fsck_lfs/pass5.c:1.26
--- src/sbin/fsck_lfs/pass5.c:1.25 Thu Jun 6 00:52:50 2013
+++ src/sbin/fsck_lfs/pass5.c Thu Jun 6 00:54:49 2013
@@ -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
Index: src/sbin/fsck_lfs/pass6.c
diff -u src/sbin/fsck_lfs/pass6.c:1.26 src/sbin/fsck_lfs/pass6.c:1.27
--- src/sbin/fsck_lfs/pass6.c:1.26 Thu Jun 6 00:52:50 2013
+++ src/sbin/fsck_lfs/pass6.c Thu Jun 6 00:54:49 2013
@@ -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
Index: src/sbin/fsck_lfs/segwrite.c
diff -u src/sbin/fsck_lfs/segwrite.c:1.22 src/sbin/fsck_lfs/segwrite.c:1.23
--- src/sbin/fsck_lfs/segwrite.c:1.22 Thu Jun 6 00:52:50 2013
+++ src/sbin/fsck_lfs/segwrite.c Thu Jun 6 00:54:49 2013
@@ -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>
Index: src/sbin/fsck_lfs/setup.c
diff -u src/sbin/fsck_lfs/setup.c:1.40 src/sbin/fsck_lfs/setup.c:1.41
--- src/sbin/fsck_lfs/setup.c:1.40 Thu Jun 6 00:52:50 2013
+++ src/sbin/fsck_lfs/setup.c Thu Jun 6 00:54:49 2013
@@ -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
Index: src/sbin/fsck_lfs/vars.c
diff -u src/sbin/fsck_lfs/vars.c:1.15 src/sbin/fsck_lfs/vars.c:1.16
--- src/sbin/fsck_lfs/vars.c:1.15 Thu Jun 6 00:52:50 2013
+++ src/sbin/fsck_lfs/vars.c Thu Jun 6 00:54:49 2013
@@ -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"
Index: src/sbin/fsck_lfs/vnode.c
diff -u src/sbin/fsck_lfs/vnode.c:1.12 src/sbin/fsck_lfs/vnode.c:1.13
--- src/sbin/fsck_lfs/vnode.c:1.12 Thu Jun 6 00:52:50 2013
+++ src/sbin/fsck_lfs/vnode.c Thu Jun 6 00:54:49 2013
@@ -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 $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -35,9 +35,11 @@
#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>
-#define vnode uvnode
#include <ufs/lfs/lfs.h>
#undef vnode
Index: src/sbin/newfs_lfs/Makefile
diff -u src/sbin/newfs_lfs/Makefile:1.9 src/sbin/newfs_lfs/Makefile:1.10
--- src/sbin/newfs_lfs/Makefile:1.9 Thu Aug 6 00:51:55 2009
+++ src/sbin/newfs_lfs/Makefile Thu Jun 6 00:54:49 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2009/08/06 00:51:55 pooka Exp $
+# $NetBSD: Makefile,v 1.10 2013/06/06 00:54:49 dholland Exp $
# @(#)Makefile 8.1 (Berkeley) 6/18/93
WARNS?= 3 # XXX: sign-compare issues
@@ -26,4 +26,7 @@ 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.21 src/sbin/newfs_lfs/make_lfs.c:1.22
--- src/sbin/newfs_lfs/make_lfs.c:1.21 Thu Jun 6 00:53:12 2013
+++ src/sbin/newfs_lfs/make_lfs.c Thu Jun 6 00:54:49 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: make_lfs.c,v 1.21 2013/06/06 00:53:12 dholland Exp $ */
+/* $NetBSD: make_lfs.c,v 1.22 2013/06/06 00:54:49 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.21 2013/06/06 00:53:12 dholland Exp $");
+__RCSID("$NetBSD: make_lfs.c,v 1.22 2013/06/06 00:54:49 dholland Exp $");
#endif
#endif /* not lint */
@@ -72,11 +72,8 @@ __RCSID("$NetBSD: make_lfs.c,v 1.21 2013
#include <sys/mount.h>
#include <sys/stat.h>
-#include <ufs/lfs/ulfs_dir.h>
-#include <ufs/lfs/ulfs_quotacommon.h>
-#include <ufs/lfs/ulfs_inode.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
@@ -84,6 +81,9 @@ __RCSID("$NetBSD: make_lfs.c,v 1.21 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 <err.h>
Index: src/sys/rump/fs/lib/liblfs/Makefile
diff -u src/sys/rump/fs/lib/liblfs/Makefile:1.6 src/sys/rump/fs/lib/liblfs/Makefile:1.7
--- src/sys/rump/fs/lib/liblfs/Makefile:1.6 Tue Feb 16 20:42:46 2010
+++ src/sys/rump/fs/lib/liblfs/Makefile Thu Jun 6 00:54:49 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2010/02/16 20:42:46 pooka Exp $
+# $NetBSD: Makefile,v 1.7 2013/06/06 00:54:49 dholland Exp $
#
.PATH: ${.CURDIR}/../../../../ufs/lfs
@@ -9,6 +9,13 @@ SRCS= lfs_alloc.c lfs_balloc.c lfs_bio.c
lfs_inode.c lfs_itimes.c lfs_rfw.c lfs_segment.c lfs_subr.c \
lfs_syscalls.c lfs_vfsops.c lfs_vnops.c
+SRCS+= ulfs_bmap.c ulfs_dirhash.c ulfs_extattr.c ulfs_ihash.c \
+ ulfs_inode.c ulfs_lookup.c ulfs_quota.c ulfs_quota1.c \
+ ulfs_quota2.c ulfs_quota1_subr.c ulfs_quota2_subr.c \
+ ulfs_rename.c ulfs_snapshot.c ulfs_vfsops.c ulfs_vnops.c \
+ ulfs_wapbl.c
+
+
CFLAGS+= -DLFS_KERNEL_RFW
.include <bsd.lib.mk>
Index: src/sys/ufs/lfs/lfs_cksum.c
diff -u src/sys/ufs/lfs/lfs_cksum.c:1.28 src/sys/ufs/lfs/lfs_cksum.c:1.29
--- src/sys/ufs/lfs/lfs_cksum.c:1.28 Thu Jun 6 00:44:40 2013
+++ src/sys/ufs/lfs/lfs_cksum.c Thu Jun 6 00:54:49 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: lfs_cksum.c,v 1.28 2013/06/06 00:44:40 dholland Exp $ */
+/* $NetBSD: lfs_cksum.c,v 1.29 2013/06/06 00:54:49 dholland Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001, 2002 The NetBSD Foundation, Inc.
@@ -60,7 +60,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lfs_cksum.c,v 1.28 2013/06/06 00:44:40 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lfs_cksum.c,v 1.29 2013/06/06 00:54:49 dholland Exp $");
#include <sys/param.h>
#ifdef _KERNEL
@@ -70,7 +70,6 @@ __KERNEL_RCSID(0, "$NetBSD: lfs_cksum.c,
# include <stddef.h>
#endif
#include <sys/mount.h>
-#include <ufs/lfs/ulfs_inode.h>
#include <ufs/lfs/lfs.h>
#include <ufs/lfs/lfs_extern.h>
Index: src/sys/ufs/lfs/lfs_itimes.c
diff -u src/sys/ufs/lfs/lfs_itimes.c:1.13 src/sys/ufs/lfs/lfs_itimes.c:1.14
--- src/sys/ufs/lfs/lfs_itimes.c:1.13 Thu Jun 6 00:44:40 2013
+++ src/sys/ufs/lfs/lfs_itimes.c Thu Jun 6 00:54:49 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: lfs_itimes.c,v 1.13 2013/06/06 00:44:40 dholland Exp $ */
+/* $NetBSD: lfs_itimes.c,v 1.14 2013/06/06 00:54:49 dholland Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001, 2002, 2003 The NetBSD Foundation, Inc.
@@ -29,15 +29,13 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lfs_itimes.c,v 1.13 2013/06/06 00:44:40 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lfs_itimes.c,v 1.14 2013/06/06 00:54:49 dholland Exp $");
#include <sys/param.h>
#include <sys/time.h>
#include <sys/mount.h>
#include <sys/buf.h>
-#include <ufs/lfs/ulfs_inode.h>
-
#ifndef _KERNEL
#include "bufcache.h"
#include "vnode.h"
@@ -45,11 +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/lfs_extern.h>
#include <sys/kauth.h>
#endif
+#include <ufs/lfs/ulfs_inode.h>
#include <ufs/lfs/lfs.h>
void
Index: src/sys/ufs/lfs/ulfs_quota.c
diff -u src/sys/ufs/lfs/ulfs_quota.c:1.5 src/sys/ufs/lfs/ulfs_quota.c:1.6
--- src/sys/ufs/lfs/ulfs_quota.c:1.5 Thu Jun 6 00:49:28 2013
+++ src/sys/ufs/lfs/ulfs_quota.c Thu Jun 6 00:54:49 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: ulfs_quota.c,v 1.5 2013/06/06 00:49:28 dholland Exp $ */
+/* $NetBSD: ulfs_quota.c,v 1.6 2013/06/06 00:54:49 dholland Exp $ */
/* from NetBSD: ufs_quota.c,v 1.112 2012/09/09 04:27:49 manu Exp */
/*
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ulfs_quota.c,v 1.5 2013/06/06 00:49:28 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ulfs_quota.c,v 1.6 2013/06/06 00:54:49 dholland Exp $");
#if defined(_KERNEL_OPT)
#include "opt_quota.h"
@@ -966,6 +966,10 @@ int
lfs_qsync(struct mount *mp)
{
struct ulfsmount *ump = VFSTOULFS(mp);
+
+ /* avoid compiler warning when quotas aren't enabled */
+ (void)ump;
+
#ifdef LFS_QUOTA
if (ump->um_flags & ULFS_QUOTA)
return lfs_q1sync(mp);
