Module Name: src
Committed By: dholland
Date: Thu Jun 6 00:44:41 UTC 2013
Modified Files:
src/sys/ufs/lfs: lfs_alloc.c lfs_balloc.c lfs_bio.c lfs_cksum.c
lfs_debug.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 ulfs_bmap.c
ulfs_dirhash.c ulfs_extattr.c ulfs_ihash.c ulfs_inode.c
ulfs_inode.h ulfs_lookup.c ulfs_quota.c ulfs_quota.h ulfs_quota1.c
ulfs_quota1.h ulfs_quota1_subr.c ulfs_quota2.c ulfs_quota2.h
ulfs_quota2_subr.c ulfs_rename.c ulfs_vfsops.c ulfs_vnops.c
ulfs_wapbl.c ulfsmount.h
Log Message:
Split lfs from ufs, part 2:
Change all <ufs/ufs/foo.h> includes to <ufs/lfs/ulfs_foo.h>.
To generate a diff of this commit:
cvs rdiff -u -r1.113 -r1.114 src/sys/ufs/lfs/lfs_alloc.c
cvs rdiff -u -r1.72 -r1.73 src/sys/ufs/lfs/lfs_balloc.c
cvs rdiff -u -r1.122 -r1.123 src/sys/ufs/lfs/lfs_bio.c
cvs rdiff -u -r1.27 -r1.28 src/sys/ufs/lfs/lfs_cksum.c
cvs rdiff -u -r1.40 -r1.41 src/sys/ufs/lfs/lfs_debug.c
cvs rdiff -u -r1.127 -r1.128 src/sys/ufs/lfs/lfs_inode.c
cvs rdiff -u -r1.12 -r1.13 src/sys/ufs/lfs/lfs_itimes.c
cvs rdiff -u -r1.13 -r1.14 src/sys/ufs/lfs/lfs_rfw.c
cvs rdiff -u -r1.225 -r1.226 src/sys/ufs/lfs/lfs_segment.c
cvs rdiff -u -r1.77 -r1.78 src/sys/ufs/lfs/lfs_subr.c
cvs rdiff -u -r1.144 -r1.145 src/sys/ufs/lfs/lfs_syscalls.c
cvs rdiff -u -r1.298 -r1.299 src/sys/ufs/lfs/lfs_vfsops.c
cvs rdiff -u -r1.243 -r1.244 src/sys/ufs/lfs/lfs_vnops.c
cvs rdiff -u -r1.1 -r1.2 src/sys/ufs/lfs/ulfs_bmap.c \
src/sys/ufs/lfs/ulfs_dirhash.c src/sys/ufs/lfs/ulfs_extattr.c \
src/sys/ufs/lfs/ulfs_ihash.c src/sys/ufs/lfs/ulfs_inode.c \
src/sys/ufs/lfs/ulfs_inode.h src/sys/ufs/lfs/ulfs_lookup.c \
src/sys/ufs/lfs/ulfs_quota.c src/sys/ufs/lfs/ulfs_quota.h \
src/sys/ufs/lfs/ulfs_quota1.c src/sys/ufs/lfs/ulfs_quota1.h \
src/sys/ufs/lfs/ulfs_quota1_subr.c src/sys/ufs/lfs/ulfs_quota2.c \
src/sys/ufs/lfs/ulfs_quota2.h src/sys/ufs/lfs/ulfs_quota2_subr.c \
src/sys/ufs/lfs/ulfs_rename.c src/sys/ufs/lfs/ulfs_vfsops.c \
src/sys/ufs/lfs/ulfs_vnops.c src/sys/ufs/lfs/ulfs_wapbl.c \
src/sys/ufs/lfs/ulfsmount.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/ufs/lfs/lfs_alloc.c
diff -u src/sys/ufs/lfs/lfs_alloc.c:1.113 src/sys/ufs/lfs/lfs_alloc.c:1.114
--- src/sys/ufs/lfs/lfs_alloc.c:1.113 Tue Jan 22 09:39:17 2013
+++ src/sys/ufs/lfs/lfs_alloc.c Thu Jun 6 00:44:40 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: lfs_alloc.c,v 1.113 2013/01/22 09:39:17 dholland Exp $ */
+/* $NetBSD: lfs_alloc.c,v 1.114 2013/06/06 00:44:40 dholland Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001, 2002, 2003, 2007 The NetBSD Foundation, Inc.
@@ -60,7 +60,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lfs_alloc.c,v 1.113 2013/01/22 09:39:17 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lfs_alloc.c,v 1.114 2013/06/06 00:44:40 dholland Exp $");
#if defined(_KERNEL_OPT)
#include "opt_quota.h"
@@ -80,10 +80,10 @@ __KERNEL_RCSID(0, "$NetBSD: lfs_alloc.c,
#include <sys/tree.h>
#include <sys/kauth.h>
-#include <ufs/ufs/quota.h>
-#include <ufs/ufs/inode.h>
-#include <ufs/ufs/ufsmount.h>
-#include <ufs/ufs/ufs_extern.h>
+#include <ufs/lfs/ulfs_quotacommon.h>
+#include <ufs/lfs/ulfs_inode.h>
+#include <ufs/lfs/ulfsmount.h>
+#include <ufs/lfs/ulfs_extern.h>
#include <ufs/lfs/lfs.h>
#include <ufs/lfs/lfs_extern.h>
Index: src/sys/ufs/lfs/lfs_balloc.c
diff -u src/sys/ufs/lfs/lfs_balloc.c:1.72 src/sys/ufs/lfs/lfs_balloc.c:1.73
--- src/sys/ufs/lfs/lfs_balloc.c:1.72 Tue Jan 22 09:39:17 2013
+++ src/sys/ufs/lfs/lfs_balloc.c Thu Jun 6 00:44:40 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: lfs_balloc.c,v 1.72 2013/01/22 09:39:17 dholland Exp $ */
+/* $NetBSD: lfs_balloc.c,v 1.73 2013/06/06 00:44:40 dholland Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001, 2002, 2003 The NetBSD Foundation, Inc.
@@ -60,7 +60,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lfs_balloc.c,v 1.72 2013/01/22 09:39:17 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lfs_balloc.c,v 1.73 2013/06/06 00:44:40 dholland Exp $");
#if defined(_KERNEL_OPT)
#include "opt_quota.h"
@@ -79,10 +79,10 @@ __KERNEL_RCSID(0, "$NetBSD: lfs_balloc.c
#include <miscfs/specfs/specdev.h>
-#include <ufs/ufs/quota.h>
-#include <ufs/ufs/inode.h>
-#include <ufs/ufs/ufsmount.h>
-#include <ufs/ufs/ufs_extern.h>
+#include <ufs/lfs/ulfs_quotacommon.h>
+#include <ufs/lfs/ulfs_inode.h>
+#include <ufs/lfs/ulfsmount.h>
+#include <ufs/lfs/ulfs_extern.h>
#include <ufs/lfs/lfs.h>
#include <ufs/lfs/lfs_extern.h>
Index: src/sys/ufs/lfs/lfs_bio.c
diff -u src/sys/ufs/lfs/lfs_bio.c:1.122 src/sys/ufs/lfs/lfs_bio.c:1.123
--- src/sys/ufs/lfs/lfs_bio.c:1.122 Thu Feb 16 02:47:55 2012
+++ src/sys/ufs/lfs/lfs_bio.c Thu Jun 6 00:44:40 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: lfs_bio.c,v 1.122 2012/02/16 02:47:55 perseant Exp $ */
+/* $NetBSD: lfs_bio.c,v 1.123 2013/06/06 00:44:40 dholland Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001, 2002, 2003, 2008 The NetBSD Foundation, Inc.
@@ -60,7 +60,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lfs_bio.c,v 1.122 2012/02/16 02:47:55 perseant Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lfs_bio.c,v 1.123 2013/06/06 00:44:40 dholland Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -72,9 +72,9 @@ __KERNEL_RCSID(0, "$NetBSD: lfs_bio.c,v
#include <sys/kernel.h>
#include <sys/kauth.h>
-#include <ufs/ufs/inode.h>
-#include <ufs/ufs/ufsmount.h>
-#include <ufs/ufs/ufs_extern.h>
+#include <ufs/lfs/ulfs_inode.h>
+#include <ufs/lfs/ulfsmount.h>
+#include <ufs/lfs/ulfs_extern.h>
#include <ufs/lfs/lfs.h>
#include <ufs/lfs/lfs_extern.h>
Index: src/sys/ufs/lfs/lfs_cksum.c
diff -u src/sys/ufs/lfs/lfs_cksum.c:1.27 src/sys/ufs/lfs/lfs_cksum.c:1.28
--- src/sys/ufs/lfs/lfs_cksum.c:1.27 Mon Apr 28 20:24:11 2008
+++ src/sys/ufs/lfs/lfs_cksum.c Thu Jun 6 00:44:40 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: lfs_cksum.c,v 1.27 2008/04/28 20:24:11 martin Exp $ */
+/* $NetBSD: lfs_cksum.c,v 1.28 2013/06/06 00:44:40 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.27 2008/04/28 20:24:11 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lfs_cksum.c,v 1.28 2013/06/06 00:44:40 dholland Exp $");
#include <sys/param.h>
#ifdef _KERNEL
@@ -70,7 +70,7 @@ __KERNEL_RCSID(0, "$NetBSD: lfs_cksum.c,
# include <stddef.h>
#endif
#include <sys/mount.h>
-#include <ufs/ufs/inode.h>
+#include <ufs/lfs/ulfs_inode.h>
#include <ufs/lfs/lfs.h>
#include <ufs/lfs/lfs_extern.h>
Index: src/sys/ufs/lfs/lfs_debug.c
diff -u src/sys/ufs/lfs/lfs_debug.c:1.40 src/sys/ufs/lfs/lfs_debug.c:1.41
--- src/sys/ufs/lfs/lfs_debug.c:1.40 Tue Jan 22 09:39:17 2013
+++ src/sys/ufs/lfs/lfs_debug.c Thu Jun 6 00:44:40 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: lfs_debug.c,v 1.40 2013/01/22 09:39:17 dholland Exp $ */
+/* $NetBSD: lfs_debug.c,v 1.41 2013/06/06 00:44:40 dholland Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001, 2002, 2003 The NetBSD Foundation, Inc.
@@ -60,7 +60,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lfs_debug.c,v 1.40 2013/01/22 09:39:17 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lfs_debug.c,v 1.41 2013/06/06 00:44:40 dholland Exp $");
#ifdef DEBUG
@@ -73,7 +73,7 @@ __KERNEL_RCSID(0, "$NetBSD: lfs_debug.c,
#include <sys/syslog.h>
#include <sys/proc.h>
-#include <ufs/ufs/inode.h>
+#include <ufs/lfs/ulfs_inode.h>
#include <ufs/lfs/lfs.h>
#include <ufs/lfs/lfs_extern.h>
Index: src/sys/ufs/lfs/lfs_inode.c
diff -u src/sys/ufs/lfs/lfs_inode.c:1.127 src/sys/ufs/lfs/lfs_inode.c:1.128
--- src/sys/ufs/lfs/lfs_inode.c:1.127 Tue Jan 22 09:39:17 2013
+++ src/sys/ufs/lfs/lfs_inode.c Thu Jun 6 00:44:40 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: lfs_inode.c,v 1.127 2013/01/22 09:39:17 dholland Exp $ */
+/* $NetBSD: lfs_inode.c,v 1.128 2013/06/06 00:44:40 dholland Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001, 2002, 2003 The NetBSD Foundation, Inc.
@@ -60,7 +60,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lfs_inode.c,v 1.127 2013/01/22 09:39:17 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lfs_inode.c,v 1.128 2013/06/06 00:44:40 dholland Exp $");
#if defined(_KERNEL_OPT)
#include "opt_quota.h"
@@ -79,10 +79,10 @@ __KERNEL_RCSID(0, "$NetBSD: lfs_inode.c,
#include <sys/resourcevar.h>
#include <sys/kauth.h>
-#include <ufs/ufs/quota.h>
-#include <ufs/ufs/inode.h>
-#include <ufs/ufs/ufsmount.h>
-#include <ufs/ufs/ufs_extern.h>
+#include <ufs/lfs/ulfs_quotacommon.h>
+#include <ufs/lfs/ulfs_inode.h>
+#include <ufs/lfs/ulfsmount.h>
+#include <ufs/lfs/ulfs_extern.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.12 src/sys/ufs/lfs/lfs_itimes.c:1.13
--- src/sys/ufs/lfs/lfs_itimes.c:1.12 Mon Apr 28 20:24:11 2008
+++ src/sys/ufs/lfs/lfs_itimes.c Thu Jun 6 00:44:40 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: lfs_itimes.c,v 1.12 2008/04/28 20:24:11 martin Exp $ */
+/* $NetBSD: lfs_itimes.c,v 1.13 2013/06/06 00:44:40 dholland Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001, 2002, 2003 The NetBSD Foundation, Inc.
@@ -29,14 +29,14 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lfs_itimes.c,v 1.12 2008/04/28 20:24:11 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lfs_itimes.c,v 1.13 2013/06/06 00:44:40 dholland Exp $");
#include <sys/param.h>
#include <sys/time.h>
#include <sys/mount.h>
#include <sys/buf.h>
-#include <ufs/ufs/inode.h>
+#include <ufs/lfs/ulfs_inode.h>
#ifndef _KERNEL
#include "bufcache.h"
Index: src/sys/ufs/lfs/lfs_rfw.c
diff -u src/sys/ufs/lfs/lfs_rfw.c:1.13 src/sys/ufs/lfs/lfs_rfw.c:1.14
--- src/sys/ufs/lfs/lfs_rfw.c:1.13 Tue Jan 22 09:39:17 2013
+++ src/sys/ufs/lfs/lfs_rfw.c Thu Jun 6 00:44:40 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: lfs_rfw.c,v 1.13 2013/01/22 09:39:17 dholland Exp $ */
+/* $NetBSD: lfs_rfw.c,v 1.14 2013/06/06 00:44:40 dholland Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001, 2002, 2003 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lfs_rfw.c,v 1.13 2013/01/22 09:39:17 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lfs_rfw.c,v 1.14 2013/06/06 00:44:40 dholland Exp $");
#if defined(_KERNEL_OPT)
#include "opt_quota.h"
@@ -62,10 +62,10 @@ __KERNEL_RCSID(0, "$NetBSD: lfs_rfw.c,v
#include <miscfs/specfs/specdev.h>
-#include <ufs/ufs/quota.h>
-#include <ufs/ufs/inode.h>
-#include <ufs/ufs/ufsmount.h>
-#include <ufs/ufs/ufs_extern.h>
+#include <ufs/lfs/ulfs_quotacommon.h>
+#include <ufs/lfs/ulfs_inode.h>
+#include <ufs/lfs/ulfsmount.h>
+#include <ufs/lfs/ulfs_extern.h>
#include <uvm/uvm.h>
#include <uvm/uvm_stat.h>
Index: src/sys/ufs/lfs/lfs_segment.c
diff -u src/sys/ufs/lfs/lfs_segment.c:1.225 src/sys/ufs/lfs/lfs_segment.c:1.226
--- src/sys/ufs/lfs/lfs_segment.c:1.225 Tue Jan 22 09:39:17 2013
+++ src/sys/ufs/lfs/lfs_segment.c Thu Jun 6 00:44:40 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: lfs_segment.c,v 1.225 2013/01/22 09:39:17 dholland Exp $ */
+/* $NetBSD: lfs_segment.c,v 1.226 2013/06/06 00:44:40 dholland Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001, 2002, 2003 The NetBSD Foundation, Inc.
@@ -60,7 +60,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lfs_segment.c,v 1.225 2013/01/22 09:39:17 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lfs_segment.c,v 1.226 2013/06/06 00:44:40 dholland Exp $");
#ifdef DEBUG
# define vndebug(vp, str) do { \
@@ -95,10 +95,10 @@ __KERNEL_RCSID(0, "$NetBSD: lfs_segment.
#include <miscfs/specfs/specdev.h>
#include <miscfs/fifofs/fifo.h>
-#include <ufs/ufs/inode.h>
-#include <ufs/ufs/dir.h>
-#include <ufs/ufs/ufsmount.h>
-#include <ufs/ufs/ufs_extern.h>
+#include <ufs/lfs/ulfs_inode.h>
+#include <ufs/lfs/ulfs_dir.h>
+#include <ufs/lfs/ulfsmount.h>
+#include <ufs/lfs/ulfs_extern.h>
#include <ufs/lfs/lfs.h>
#include <ufs/lfs/lfs_extern.h>
Index: src/sys/ufs/lfs/lfs_subr.c
diff -u src/sys/ufs/lfs/lfs_subr.c:1.77 src/sys/ufs/lfs/lfs_subr.c:1.78
--- src/sys/ufs/lfs/lfs_subr.c:1.77 Mon Jan 2 22:10:44 2012
+++ src/sys/ufs/lfs/lfs_subr.c Thu Jun 6 00:44:40 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: lfs_subr.c,v 1.77 2012/01/02 22:10:44 perseant Exp $ */
+/* $NetBSD: lfs_subr.c,v 1.78 2013/06/06 00:44:40 dholland Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001, 2002, 2003 The NetBSD Foundation, Inc.
@@ -60,7 +60,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lfs_subr.c,v 1.77 2012/01/02 22:10:44 perseant Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lfs_subr.c,v 1.78 2013/06/06 00:44:40 dholland Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -72,7 +72,7 @@ __KERNEL_RCSID(0, "$NetBSD: lfs_subr.c,v
#include <sys/proc.h>
#include <sys/kauth.h>
-#include <ufs/ufs/inode.h>
+#include <ufs/lfs/ulfs_inode.h>
#include <ufs/lfs/lfs.h>
#include <ufs/lfs/lfs_extern.h>
Index: src/sys/ufs/lfs/lfs_syscalls.c
diff -u src/sys/ufs/lfs/lfs_syscalls.c:1.144 src/sys/ufs/lfs/lfs_syscalls.c:1.145
--- src/sys/ufs/lfs/lfs_syscalls.c:1.144 Tue Jan 22 09:39:18 2013
+++ src/sys/ufs/lfs/lfs_syscalls.c Thu Jun 6 00:44:40 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: lfs_syscalls.c,v 1.144 2013/01/22 09:39:18 dholland Exp $ */
+/* $NetBSD: lfs_syscalls.c,v 1.145 2013/06/06 00:44:40 dholland Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001, 2002, 2003, 2007, 2007, 2008
@@ -61,7 +61,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lfs_syscalls.c,v 1.144 2013/01/22 09:39:18 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lfs_syscalls.c,v 1.145 2013/06/06 00:44:40 dholland Exp $");
#ifndef LFS
# define LFS /* for prototypes in syscallargs.h */
@@ -77,9 +77,9 @@ __KERNEL_RCSID(0, "$NetBSD: lfs_syscalls
#include <sys/kauth.h>
#include <sys/syscallargs.h>
-#include <ufs/ufs/inode.h>
-#include <ufs/ufs/ufsmount.h>
-#include <ufs/ufs/ufs_extern.h>
+#include <ufs/lfs/ulfs_inode.h>
+#include <ufs/lfs/ulfsmount.h>
+#include <ufs/lfs/ulfs_extern.h>
#include <ufs/lfs/lfs.h>
#include <ufs/lfs/lfs_extern.h>
Index: src/sys/ufs/lfs/lfs_vfsops.c
diff -u src/sys/ufs/lfs/lfs_vfsops.c:1.298 src/sys/ufs/lfs/lfs_vfsops.c:1.299
--- src/sys/ufs/lfs/lfs_vfsops.c:1.298 Tue Jan 22 09:39:18 2013
+++ src/sys/ufs/lfs/lfs_vfsops.c Thu Jun 6 00:44:40 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: lfs_vfsops.c,v 1.298 2013/01/22 09:39:18 dholland Exp $ */
+/* $NetBSD: lfs_vfsops.c,v 1.299 2013/06/06 00:44:40 dholland Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001, 2002, 2003, 2007, 2007
@@ -61,7 +61,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lfs_vfsops.c,v 1.298 2013/01/22 09:39:18 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lfs_vfsops.c,v 1.299 2013/06/06 00:44:40 dholland Exp $");
#if defined(_KERNEL_OPT)
#include "opt_lfs.h"
@@ -98,10 +98,10 @@ __KERNEL_RCSID(0, "$NetBSD: lfs_vfsops.c
#include <miscfs/specfs/specdev.h>
-#include <ufs/ufs/quota.h>
-#include <ufs/ufs/inode.h>
-#include <ufs/ufs/ufsmount.h>
-#include <ufs/ufs/ufs_extern.h>
+#include <ufs/lfs/ulfs_quotacommon.h>
+#include <ufs/lfs/ulfs_inode.h>
+#include <ufs/lfs/ulfsmount.h>
+#include <ufs/lfs/ulfs_extern.h>
#include <uvm/uvm.h>
#include <uvm/uvm_stat.h>
Index: src/sys/ufs/lfs/lfs_vnops.c
diff -u src/sys/ufs/lfs/lfs_vnops.c:1.243 src/sys/ufs/lfs/lfs_vnops.c:1.244
--- src/sys/ufs/lfs/lfs_vnops.c:1.243 Tue Jan 22 09:39:18 2013
+++ src/sys/ufs/lfs/lfs_vnops.c Thu Jun 6 00:44:40 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: lfs_vnops.c,v 1.243 2013/01/22 09:39:18 dholland Exp $ */
+/* $NetBSD: lfs_vnops.c,v 1.244 2013/06/06 00:44:40 dholland Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001, 2002, 2003 The NetBSD Foundation, Inc.
@@ -60,7 +60,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lfs_vnops.c,v 1.243 2013/01/22 09:39:18 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lfs_vnops.c,v 1.244 2013/06/06 00:44:40 dholland Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@@ -88,11 +88,11 @@ __KERNEL_RCSID(0, "$NetBSD: lfs_vnops.c,
#include <miscfs/genfs/genfs.h>
#include <miscfs/specfs/specdev.h>
-#include <ufs/ufs/inode.h>
-#include <ufs/ufs/dir.h>
-#include <ufs/ufs/ufsmount.h>
-#include <ufs/ufs/ufs_bswap.h>
-#include <ufs/ufs/ufs_extern.h>
+#include <ufs/lfs/ulfs_inode.h>
+#include <ufs/lfs/ulfs_dir.h>
+#include <ufs/lfs/ulfsmount.h>
+#include <ufs/lfs/ulfs_bswap.h>
+#include <ufs/lfs/ulfs_extern.h>
#include <uvm/uvm.h>
#include <uvm/uvm_pmap.h>
@@ -253,7 +253,7 @@ const struct vnodeopv_desc lfs_fifoop_op
static int check_dirty(struct lfs *, struct vnode *, off_t, off_t, off_t, int, int, struct vm_page **);
#define LFS_READWRITE
-#include <ufs/ufs/ufs_readwrite.c>
+#include <ufs/lfs/ulfs_readwrite.c>
#undef LFS_READWRITE
/*
Index: src/sys/ufs/lfs/ulfs_bmap.c
diff -u src/sys/ufs/lfs/ulfs_bmap.c:1.1 src/sys/ufs/lfs/ulfs_bmap.c:1.2
--- src/sys/ufs/lfs/ulfs_bmap.c:1.1 Thu Jun 6 00:40:55 2013
+++ src/sys/ufs/lfs/ulfs_bmap.c Thu Jun 6 00:44:40 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: ulfs_bmap.c,v 1.1 2013/06/06 00:40:55 dholland Exp $ */
+/* $NetBSD: ulfs_bmap.c,v 1.2 2013/06/06 00:44:40 dholland Exp $ */
/* from NetBSD: ufs_bmap.c,v 1.50 2013/01/22 09:39:18 dholland Exp */
/*
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ulfs_bmap.c,v 1.1 2013/06/06 00:40:55 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ulfs_bmap.c,v 1.2 2013/06/06 00:44:40 dholland Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -52,10 +52,10 @@ __KERNEL_RCSID(0, "$NetBSD: ulfs_bmap.c,
#include <miscfs/specfs/specdev.h>
-#include <ufs/ufs/inode.h>
-#include <ufs/ufs/ufsmount.h>
-#include <ufs/ufs/ufs_extern.h>
-#include <ufs/ufs/ufs_bswap.h>
+#include <ufs/lfs/ulfs_inode.h>
+#include <ufs/lfs/ulfsmount.h>
+#include <ufs/lfs/ulfs_extern.h>
+#include <ufs/lfs/ulfs_bswap.h>
static bool
ufs_issequential(const struct ufsmount *ump, daddr_t daddr0, daddr_t daddr1)
Index: src/sys/ufs/lfs/ulfs_dirhash.c
diff -u src/sys/ufs/lfs/ulfs_dirhash.c:1.1 src/sys/ufs/lfs/ulfs_dirhash.c:1.2
--- src/sys/ufs/lfs/ulfs_dirhash.c:1.1 Thu Jun 6 00:40:55 2013
+++ src/sys/ufs/lfs/ulfs_dirhash.c Thu Jun 6 00:44:40 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: ulfs_dirhash.c,v 1.1 2013/06/06 00:40:55 dholland Exp $ */
+/* $NetBSD: ulfs_dirhash.c,v 1.2 2013/06/06 00:44:40 dholland Exp $ */
/* from NetBSD: ufs_dirhash.c,v 1.34 2009/10/05 23:48:08 rmind Exp */
/*
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ulfs_dirhash.c,v 1.1 2013/06/06 00:40:55 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ulfs_dirhash.c,v 1.2 2013/06/06 00:44:40 dholland Exp $");
/*
* This implements a hash-based lookup scheme for UFS directories.
@@ -49,12 +49,12 @@ __KERNEL_RCSID(0, "$NetBSD: ulfs_dirhash
#include <sys/sysctl.h>
#include <sys/atomic.h>
-#include <ufs/ufs/inode.h>
-#include <ufs/ufs/dir.h>
-#include <ufs/ufs/dirhash.h>
-#include <ufs/ufs/ufsmount.h>
-#include <ufs/ufs/ufs_bswap.h>
-#include <ufs/ufs/ufs_extern.h>
+#include <ufs/lfs/ulfs_inode.h>
+#include <ufs/lfs/ulfs_dir.h>
+#include <ufs/lfs/ulfs_dirhash.h>
+#include <ufs/lfs/ulfsmount.h>
+#include <ufs/lfs/ulfs_bswap.h>
+#include <ufs/lfs/ulfs_extern.h>
#define WRAPINCR(val, limit) (((val) + 1 == (limit)) ? 0 : ((val) + 1))
#define WRAPDECR(val, limit) (((val) == 0) ? ((limit) - 1) : ((val) - 1))
Index: src/sys/ufs/lfs/ulfs_extattr.c
diff -u src/sys/ufs/lfs/ulfs_extattr.c:1.1 src/sys/ufs/lfs/ulfs_extattr.c:1.2
--- src/sys/ufs/lfs/ulfs_extattr.c:1.1 Thu Jun 6 00:40:55 2013
+++ src/sys/ufs/lfs/ulfs_extattr.c Thu Jun 6 00:44:40 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: ulfs_extattr.c,v 1.1 2013/06/06 00:40:55 dholland Exp $ */
+/* $NetBSD: ulfs_extattr.c,v 1.2 2013/06/06 00:44:40 dholland Exp $ */
/* from NetBSD: ufs_extattr.c,v 1.41 2012/12/08 13:42:36 manu Exp */
/*-
@@ -49,7 +49,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ulfs_extattr.c,v 1.1 2013/06/06 00:40:55 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ulfs_extattr.c,v 1.2 2013/06/06 00:44:40 dholland Exp $");
#ifdef _KERNEL_OPT
#include "opt_ffs.h"
@@ -71,12 +71,12 @@ __KERNEL_RCSID(0, "$NetBSD: ulfs_extattr
#include <sys/extattr.h>
#include <sys/sysctl.h>
-#include <ufs/ufs/dir.h>
-#include <ufs/ufs/extattr.h>
-#include <ufs/ufs/ufsmount.h>
-#include <ufs/ufs/inode.h>
-#include <ufs/ufs/ufs_bswap.h>
-#include <ufs/ufs/ufs_extern.h>
+#include <ufs/lfs/ulfs_dir.h>
+#include <ufs/lfs/ulfs_extattr.h>
+#include <ufs/lfs/ulfsmount.h>
+#include <ufs/lfs/ulfs_inode.h>
+#include <ufs/lfs/ulfs_bswap.h>
+#include <ufs/lfs/ulfs_extern.h>
int ufs_extattr_sync = 1;
int ufs_extattr_autocreate = 1024;
Index: src/sys/ufs/lfs/ulfs_ihash.c
diff -u src/sys/ufs/lfs/ulfs_ihash.c:1.1 src/sys/ufs/lfs/ulfs_ihash.c:1.2
--- src/sys/ufs/lfs/ulfs_ihash.c:1.1 Thu Jun 6 00:40:55 2013
+++ src/sys/ufs/lfs/ulfs_ihash.c Thu Jun 6 00:44:40 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: ulfs_ihash.c,v 1.1 2013/06/06 00:40:55 dholland Exp $ */
+/* $NetBSD: ulfs_ihash.c,v 1.2 2013/06/06 00:44:40 dholland Exp $ */
/* from NetBSD: ufs_ihash.c,v 1.31 2011/06/12 03:36:02 rmind Exp */
/*
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ulfs_ihash.c,v 1.1 2013/06/06 00:40:55 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ulfs_ihash.c,v 1.2 2013/06/06 00:44:40 dholland Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -41,8 +41,8 @@ __KERNEL_RCSID(0, "$NetBSD: ulfs_ihash.c
#include <sys/proc.h>
#include <sys/mutex.h>
-#include <ufs/ufs/inode.h>
-#include <ufs/ufs/ufs_extern.h>
+#include <ufs/lfs/ulfs_inode.h>
+#include <ufs/lfs/ulfs_extern.h>
/*
* Structures associated with inode cacheing.
Index: src/sys/ufs/lfs/ulfs_inode.c
diff -u src/sys/ufs/lfs/ulfs_inode.c:1.1 src/sys/ufs/lfs/ulfs_inode.c:1.2
--- src/sys/ufs/lfs/ulfs_inode.c:1.1 Thu Jun 6 00:40:55 2013
+++ src/sys/ufs/lfs/ulfs_inode.c Thu Jun 6 00:44:40 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: ulfs_inode.c,v 1.1 2013/06/06 00:40:55 dholland Exp $ */
+/* $NetBSD: ulfs_inode.c,v 1.2 2013/06/06 00:44:40 dholland Exp $ */
/* from NetBSD: ufs_inode.c,v 1.89 2013/01/22 09:39:18 dholland Exp */
/*
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ulfs_inode.c,v 1.1 2013/06/06 00:40:55 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ulfs_inode.c,v 1.2 2013/06/06 00:44:40 dholland Exp $");
#if defined(_KERNEL_OPT)
#include "opt_ffs.h"
@@ -58,15 +58,15 @@ __KERNEL_RCSID(0, "$NetBSD: ulfs_inode.c
#include <sys/fstrans.h>
#include <sys/kmem.h>
-#include <ufs/ufs/inode.h>
-#include <ufs/ufs/ufsmount.h>
-#include <ufs/ufs/ufs_extern.h>
-#include <ufs/ufs/ufs_wapbl.h>
+#include <ufs/lfs/ulfs_inode.h>
+#include <ufs/lfs/ulfsmount.h>
+#include <ufs/lfs/ulfs_extern.h>
+#include <ufs/lfs/ulfs_wapbl.h>
#ifdef UFS_DIRHASH
-#include <ufs/ufs/dirhash.h>
+#include <ufs/lfs/ulfs_dirhash.h>
#endif
#ifdef UFS_EXTATTR
-#include <ufs/ufs/extattr.h>
+#include <ufs/lfs/ulfs_extattr.h>
#endif
#include <uvm/uvm.h>
Index: src/sys/ufs/lfs/ulfs_inode.h
diff -u src/sys/ufs/lfs/ulfs_inode.h:1.1 src/sys/ufs/lfs/ulfs_inode.h:1.2
--- src/sys/ufs/lfs/ulfs_inode.h:1.1 Thu Jun 6 00:40:55 2013
+++ src/sys/ufs/lfs/ulfs_inode.h Thu Jun 6 00:44:40 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: ulfs_inode.h,v 1.1 2013/06/06 00:40:55 dholland Exp $ */
+/* $NetBSD: ulfs_inode.h,v 1.2 2013/06/06 00:44:40 dholland Exp $ */
/* from NetBSD: inode.h,v 1.64 2012/11/19 00:36:21 jakllsch Exp */
/*
@@ -41,9 +41,9 @@
#define _UFS_UFS_INODE_H_
#include <sys/vnode.h>
-#include <ufs/ufs/dinode.h>
-#include <ufs/ufs/dir.h>
-#include <ufs/ufs/quota.h>
+#include <ufs/lfs/ulfs_dinode.h>
+#include <ufs/lfs/ulfs_dir.h>
+#include <ufs/lfs/ulfs_quotacommon.h>
#include <ufs/ext2fs/ext2fs_dinode.h>
#include <miscfs/genfs/genfs_node.h>
Index: src/sys/ufs/lfs/ulfs_lookup.c
diff -u src/sys/ufs/lfs/ulfs_lookup.c:1.1 src/sys/ufs/lfs/ulfs_lookup.c:1.2
--- src/sys/ufs/lfs/ulfs_lookup.c:1.1 Thu Jun 6 00:40:55 2013
+++ src/sys/ufs/lfs/ulfs_lookup.c Thu Jun 6 00:44:40 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: ulfs_lookup.c,v 1.1 2013/06/06 00:40:55 dholland Exp $ */
+/* $NetBSD: ulfs_lookup.c,v 1.2 2013/06/06 00:44:40 dholland Exp $ */
/* from NetBSD: ufs_lookup.c,v 1.122 2013/01/22 09:39:18 dholland Exp */
/*
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ulfs_lookup.c,v 1.1 2013/06/06 00:40:55 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ulfs_lookup.c,v 1.2 2013/06/06 00:44:40 dholland Exp $");
#ifdef _KERNEL_OPT
#include "opt_ffs.h"
@@ -59,15 +59,15 @@ __KERNEL_RCSID(0, "$NetBSD: ulfs_lookup.
#include <sys/proc.h>
#include <sys/kmem.h>
-#include <ufs/ufs/inode.h>
-#include <ufs/ufs/dir.h>
+#include <ufs/lfs/ulfs_inode.h>
+#include <ufs/lfs/ulfs_dir.h>
#ifdef UFS_DIRHASH
-#include <ufs/ufs/dirhash.h>
+#include <ufs/lfs/ulfs_dirhash.h>
#endif
-#include <ufs/ufs/ufsmount.h>
-#include <ufs/ufs/ufs_extern.h>
-#include <ufs/ufs/ufs_bswap.h>
-#include <ufs/ufs/ufs_wapbl.h>
+#include <ufs/lfs/ulfsmount.h>
+#include <ufs/lfs/ulfs_extern.h>
+#include <ufs/lfs/ulfs_bswap.h>
+#include <ufs/lfs/ulfs_wapbl.h>
#include <miscfs/genfs/genfs.h>
Index: src/sys/ufs/lfs/ulfs_quota.c
diff -u src/sys/ufs/lfs/ulfs_quota.c:1.1 src/sys/ufs/lfs/ulfs_quota.c:1.2
--- src/sys/ufs/lfs/ulfs_quota.c:1.1 Thu Jun 6 00:40:55 2013
+++ src/sys/ufs/lfs/ulfs_quota.c Thu Jun 6 00:44:40 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: ulfs_quota.c,v 1.1 2013/06/06 00:40:55 dholland Exp $ */
+/* $NetBSD: ulfs_quota.c,v 1.2 2013/06/06 00:44:40 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.1 2013/06/06 00:40:55 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ulfs_quota.c,v 1.2 2013/06/06 00:44:40 dholland Exp $");
#if defined(_KERNEL_OPT)
#include "opt_quota.h"
@@ -52,11 +52,11 @@ __KERNEL_RCSID(0, "$NetBSD: ulfs_quota.c
#include <sys/kauth.h>
#include <sys/quotactl.h>
-#include <ufs/ufs/quota.h>
-#include <ufs/ufs/inode.h>
-#include <ufs/ufs/ufsmount.h>
-#include <ufs/ufs/ufs_extern.h>
-#include <ufs/ufs/ufs_quota.h>
+#include <ufs/lfs/ulfs_quotacommon.h>
+#include <ufs/lfs/ulfs_inode.h>
+#include <ufs/lfs/ulfsmount.h>
+#include <ufs/lfs/ulfs_extern.h>
+#include <ufs/lfs/ulfs_quota.h>
kmutex_t dqlock;
kcondvar_t dqcv;
Index: src/sys/ufs/lfs/ulfs_quota.h
diff -u src/sys/ufs/lfs/ulfs_quota.h:1.1 src/sys/ufs/lfs/ulfs_quota.h:1.2
--- src/sys/ufs/lfs/ulfs_quota.h:1.1 Thu Jun 6 00:40:55 2013
+++ src/sys/ufs/lfs/ulfs_quota.h Thu Jun 6 00:44:40 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: ulfs_quota.h,v 1.1 2013/06/06 00:40:55 dholland Exp $ */
+/* $NetBSD: ulfs_quota.h,v 1.2 2013/06/06 00:44:40 dholland Exp $ */
/* from NetBSD: ufs_quota.h,v 1.21 2012/02/18 06:13:23 matt Exp */
/*
@@ -34,8 +34,8 @@
*
* @(#)ufs_quota.c 8.5 (Berkeley) 5/20/95
*/
-#include <ufs/ufs/quota1.h>
-#include <ufs/ufs/quota2.h>
+#include <ufs/lfs/ulfs_quota1.h>
+#include <ufs/lfs/ulfs_quota2.h>
struct quotakcursor; /* from <sys/quotactl.h> */
Index: src/sys/ufs/lfs/ulfs_quota1.c
diff -u src/sys/ufs/lfs/ulfs_quota1.c:1.1 src/sys/ufs/lfs/ulfs_quota1.c:1.2
--- src/sys/ufs/lfs/ulfs_quota1.c:1.1 Thu Jun 6 00:40:55 2013
+++ src/sys/ufs/lfs/ulfs_quota1.c Thu Jun 6 00:44:40 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: ulfs_quota1.c,v 1.1 2013/06/06 00:40:55 dholland Exp $ */
+/* $NetBSD: ulfs_quota1.c,v 1.2 2013/06/06 00:44:40 dholland Exp $ */
/* from NetBSD: ufs_quota1.c,v 1.18 2012/02/02 03:00:48 matt Exp */
/*
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ulfs_quota1.c,v 1.1 2013/06/06 00:40:55 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ulfs_quota1.c,v 1.2 2013/06/06 00:44:40 dholland Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -48,11 +48,11 @@ __KERNEL_RCSID(0, "$NetBSD: ulfs_quota1.
#include <sys/mount.h>
#include <sys/kauth.h>
-#include <ufs/ufs/quota1.h>
-#include <ufs/ufs/inode.h>
-#include <ufs/ufs/ufsmount.h>
-#include <ufs/ufs/ufs_extern.h>
-#include <ufs/ufs/ufs_quota.h>
+#include <ufs/lfs/ulfs_quota1.h>
+#include <ufs/lfs/ulfs_inode.h>
+#include <ufs/lfs/ulfsmount.h>
+#include <ufs/lfs/ulfs_extern.h>
+#include <ufs/lfs/ulfs_quota.h>
static int chkdqchg(struct inode *, int64_t, kauth_cred_t, int);
static int chkiqchg(struct inode *, int32_t, kauth_cred_t, int);
Index: src/sys/ufs/lfs/ulfs_quota1.h
diff -u src/sys/ufs/lfs/ulfs_quota1.h:1.1 src/sys/ufs/lfs/ulfs_quota1.h:1.2
--- src/sys/ufs/lfs/ulfs_quota1.h:1.1 Thu Jun 6 00:40:55 2013
+++ src/sys/ufs/lfs/ulfs_quota1.h Thu Jun 6 00:44:40 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: ulfs_quota1.h,v 1.1 2013/06/06 00:40:55 dholland Exp $ */
+/* $NetBSD: ulfs_quota1.h,v 1.2 2013/06/06 00:44:40 dholland Exp $ */
/* from NetBSD: quota1.h,v 1.7 2012/08/26 02:32:14 dholland Exp */
/*
@@ -39,7 +39,7 @@
#define _UFS_UFS_QUOTA1_H_
#include <sys/quota.h>
-#include <ufs/ufs/quota.h>
+#include <ufs/lfs/ulfs_quotacommon.h>
/*
* These definitions are for the original disk quota implementation, which
Index: src/sys/ufs/lfs/ulfs_quota1_subr.c
diff -u src/sys/ufs/lfs/ulfs_quota1_subr.c:1.1 src/sys/ufs/lfs/ulfs_quota1_subr.c:1.2
--- src/sys/ufs/lfs/ulfs_quota1_subr.c:1.1 Thu Jun 6 00:40:55 2013
+++ src/sys/ufs/lfs/ulfs_quota1_subr.c Thu Jun 6 00:44:40 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: ulfs_quota1_subr.c,v 1.1 2013/06/06 00:40:55 dholland Exp $ */
+/* $NetBSD: ulfs_quota1_subr.c,v 1.2 2013/06/06 00:44:40 dholland Exp $ */
/* from NetBSD: quota1_subr.c,v 1.7 2012/01/29 06:23:20 dholland Exp */
/*-
@@ -28,13 +28,13 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ulfs_quota1_subr.c,v 1.1 2013/06/06 00:40:55 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ulfs_quota1_subr.c,v 1.2 2013/06/06 00:44:40 dholland Exp $");
#include <sys/types.h>
#include <machine/limits.h>
#include <sys/quota.h>
-#include <ufs/ufs/quota1.h>
+#include <ufs/lfs/ulfs_quota1.h>
static uint64_t
dqblk2q2e_limit(uint32_t lim)
Index: src/sys/ufs/lfs/ulfs_quota2.c
diff -u src/sys/ufs/lfs/ulfs_quota2.c:1.1 src/sys/ufs/lfs/ulfs_quota2.c:1.2
--- src/sys/ufs/lfs/ulfs_quota2.c:1.1 Thu Jun 6 00:40:55 2013
+++ src/sys/ufs/lfs/ulfs_quota2.c Thu Jun 6 00:44:40 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: ulfs_quota2.c,v 1.1 2013/06/06 00:40:55 dholland Exp $ */
+/* $NetBSD: ulfs_quota2.c,v 1.2 2013/06/06 00:44:40 dholland Exp $ */
/* from NetBSD: ufs_quota2.c,v 1.35 2012/09/27 07:47:56 bouyer Exp */
/*-
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ulfs_quota2.c,v 1.1 2013/06/06 00:40:55 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ulfs_quota2.c,v 1.2 2013/06/06 00:44:40 dholland Exp $");
#include <sys/buf.h>
#include <sys/param.h>
@@ -45,13 +45,13 @@ __KERNEL_RCSID(0, "$NetBSD: ulfs_quota2.
#include <sys/quota.h>
#include <sys/quotactl.h>
-#include <ufs/ufs/quota2.h>
-#include <ufs/ufs/inode.h>
-#include <ufs/ufs/ufsmount.h>
-#include <ufs/ufs/ufs_bswap.h>
-#include <ufs/ufs/ufs_extern.h>
-#include <ufs/ufs/ufs_quota.h>
-#include <ufs/ufs/ufs_wapbl.h>
+#include <ufs/lfs/ulfs_quota2.h>
+#include <ufs/lfs/ulfs_inode.h>
+#include <ufs/lfs/ulfsmount.h>
+#include <ufs/lfs/ulfs_bswap.h>
+#include <ufs/lfs/ulfs_extern.h>
+#include <ufs/lfs/ulfs_quota.h>
+#include <ufs/lfs/ulfs_wapbl.h>
/*
* LOCKING:
Index: src/sys/ufs/lfs/ulfs_quota2.h
diff -u src/sys/ufs/lfs/ulfs_quota2.h:1.1 src/sys/ufs/lfs/ulfs_quota2.h:1.2
--- src/sys/ufs/lfs/ulfs_quota2.h:1.1 Thu Jun 6 00:40:55 2013
+++ src/sys/ufs/lfs/ulfs_quota2.h Thu Jun 6 00:44:40 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: ulfs_quota2.h,v 1.1 2013/06/06 00:40:55 dholland Exp $ */
+/* $NetBSD: ulfs_quota2.h,v 1.2 2013/06/06 00:44:40 dholland Exp $ */
/* from NetBSD: quota2.h,v 1.9 2012/02/05 14:19:04 dholland Exp */
/*-
@@ -29,7 +29,7 @@
#ifndef _UFS_UFS_QUOTA2_H_
#define _UFS_UFS_QUOTA2_H_
-#include <ufs/ufs/quota.h>
+#include <ufs/lfs/ulfs_quotacommon.h>
/* New disk quota implementation. In this implementation, the quota datas
Index: src/sys/ufs/lfs/ulfs_quota2_subr.c
diff -u src/sys/ufs/lfs/ulfs_quota2_subr.c:1.1 src/sys/ufs/lfs/ulfs_quota2_subr.c:1.2
--- src/sys/ufs/lfs/ulfs_quota2_subr.c:1.1 Thu Jun 6 00:40:55 2013
+++ src/sys/ufs/lfs/ulfs_quota2_subr.c Thu Jun 6 00:44:40 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: ulfs_quota2_subr.c,v 1.1 2013/06/06 00:40:55 dholland Exp $ */
+/* $NetBSD: ulfs_quota2_subr.c,v 1.2 2013/06/06 00:44:40 dholland Exp $ */
/* from NetBSD: quota2_subr.c,v 1.5 2012/02/05 14:19:04 dholland Exp */
/*-
@@ -28,16 +28,16 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ulfs_quota2_subr.c,v 1.1 2013/06/06 00:40:55 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ulfs_quota2_subr.c,v 1.2 2013/06/06 00:44:40 dholland Exp $");
#include <sys/param.h>
#include <sys/time.h>
-#include <ufs/ufs/dinode.h>
+#include <ufs/lfs/ulfs_dinode.h>
#include <ufs/ffs/fs.h>
#include <ufs/ffs/ffs_extern.h>
-#include <ufs/ufs/ufs_bswap.h>
-#include <ufs/ufs/quota2.h>
+#include <ufs/lfs/ulfs_bswap.h>
+#include <ufs/lfs/ulfs_quota2.h>
#ifndef _KERNEL
#include <string.h>
Index: src/sys/ufs/lfs/ulfs_rename.c
diff -u src/sys/ufs/lfs/ulfs_rename.c:1.1 src/sys/ufs/lfs/ulfs_rename.c:1.2
--- src/sys/ufs/lfs/ulfs_rename.c:1.1 Thu Jun 6 00:40:55 2013
+++ src/sys/ufs/lfs/ulfs_rename.c Thu Jun 6 00:44:40 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: ulfs_rename.c,v 1.1 2013/06/06 00:40:55 dholland Exp $ */
+/* $NetBSD: ulfs_rename.c,v 1.2 2013/06/06 00:44:40 dholland Exp $ */
/* from NetBSD: ufs_rename.c,v 1.6 2013/01/22 09:39:18 dholland Exp */
/*-
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ulfs_rename.c,v 1.1 2013/06/06 00:40:55 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ulfs_rename.c,v 1.2 2013/06/06 00:44:40 dholland Exp $");
#include <sys/param.h>
#include <sys/buf.h>
@@ -51,12 +51,12 @@ __KERNEL_RCSID(0, "$NetBSD: ulfs_rename.
#include <miscfs/genfs/genfs.h>
-#include <ufs/ufs/dir.h>
-#include <ufs/ufs/inode.h>
-#include <ufs/ufs/ufs_bswap.h>
-#include <ufs/ufs/ufs_extern.h>
-#include <ufs/ufs/ufs_wapbl.h>
-#include <ufs/ufs/ufsmount.h>
+#include <ufs/lfs/ulfs_dir.h>
+#include <ufs/lfs/ulfs_inode.h>
+#include <ufs/lfs/ulfs_bswap.h>
+#include <ufs/lfs/ulfs_extern.h>
+#include <ufs/lfs/ulfs_wapbl.h>
+#include <ufs/lfs/ulfsmount.h>
/*
* Forward declarations
Index: src/sys/ufs/lfs/ulfs_vfsops.c
diff -u src/sys/ufs/lfs/ulfs_vfsops.c:1.1 src/sys/ufs/lfs/ulfs_vfsops.c:1.2
--- src/sys/ufs/lfs/ulfs_vfsops.c:1.1 Thu Jun 6 00:40:55 2013
+++ src/sys/ufs/lfs/ulfs_vfsops.c Thu Jun 6 00:44:40 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: ulfs_vfsops.c,v 1.1 2013/06/06 00:40:55 dholland Exp $ */
+/* $NetBSD: ulfs_vfsops.c,v 1.2 2013/06/06 00:44:40 dholland Exp $ */
/* from NetBSD: ufs_vfsops.c,v 1.52 2013/01/22 09:39:18 dholland Exp */
/*
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ulfs_vfsops.c,v 1.1 2013/06/06 00:40:55 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ulfs_vfsops.c,v 1.2 2013/06/06 00:44:40 dholland Exp $");
#if defined(_KERNEL_OPT)
#include "opt_ffs.h"
@@ -57,12 +57,12 @@ __KERNEL_RCSID(0, "$NetBSD: ulfs_vfsops.
#include <miscfs/specfs/specdev.h>
#include <sys/quotactl.h>
-#include <ufs/ufs/quota.h>
-#include <ufs/ufs/inode.h>
-#include <ufs/ufs/ufsmount.h>
-#include <ufs/ufs/ufs_extern.h>
+#include <ufs/lfs/ulfs_quotacommon.h>
+#include <ufs/lfs/ulfs_inode.h>
+#include <ufs/lfs/ulfsmount.h>
+#include <ufs/lfs/ulfs_extern.h>
#ifdef UFS_DIRHASH
-#include <ufs/ufs/dirhash.h>
+#include <ufs/lfs/ulfs_dirhash.h>
#endif
/* how many times ufs_init() was called */
Index: src/sys/ufs/lfs/ulfs_vnops.c
diff -u src/sys/ufs/lfs/ulfs_vnops.c:1.1 src/sys/ufs/lfs/ulfs_vnops.c:1.2
--- src/sys/ufs/lfs/ulfs_vnops.c:1.1 Thu Jun 6 00:40:55 2013
+++ src/sys/ufs/lfs/ulfs_vnops.c Thu Jun 6 00:44:40 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: ulfs_vnops.c,v 1.1 2013/06/06 00:40:55 dholland Exp $ */
+/* $NetBSD: ulfs_vnops.c,v 1.2 2013/06/06 00:44:40 dholland Exp $ */
/* from NetBSD: ufs_vnops.c,v 1.212 2013/03/18 19:35:48 plunky Exp */
/*-
@@ -67,7 +67,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ulfs_vnops.c,v 1.1 2013/06/06 00:40:55 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ulfs_vnops.c,v 1.2 2013/06/06 00:44:40 dholland Exp $");
#if defined(_KERNEL_OPT)
#include "opt_ffs.h"
@@ -97,14 +97,14 @@ __KERNEL_RCSID(0, "$NetBSD: ulfs_vnops.c
#include <miscfs/fifofs/fifo.h>
#include <miscfs/genfs/genfs.h>
-#include <ufs/ufs/inode.h>
-#include <ufs/ufs/dir.h>
-#include <ufs/ufs/ufsmount.h>
-#include <ufs/ufs/ufs_bswap.h>
-#include <ufs/ufs/ufs_extern.h>
-#include <ufs/ufs/ufs_wapbl.h>
+#include <ufs/lfs/ulfs_inode.h>
+#include <ufs/lfs/ulfs_dir.h>
+#include <ufs/lfs/ulfsmount.h>
+#include <ufs/lfs/ulfs_bswap.h>
+#include <ufs/lfs/ulfs_extern.h>
+#include <ufs/lfs/ulfs_wapbl.h>
#ifdef UFS_DIRHASH
-#include <ufs/ufs/dirhash.h>
+#include <ufs/lfs/ulfs_dirhash.h>
#endif
#include <ufs/ext2fs/ext2fs_extern.h>
#include <ufs/ext2fs/ext2fs_dir.h>
Index: src/sys/ufs/lfs/ulfs_wapbl.c
diff -u src/sys/ufs/lfs/ulfs_wapbl.c:1.1 src/sys/ufs/lfs/ulfs_wapbl.c:1.2
--- src/sys/ufs/lfs/ulfs_wapbl.c:1.1 Thu Jun 6 00:40:55 2013
+++ src/sys/ufs/lfs/ulfs_wapbl.c Thu Jun 6 00:44:41 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: ulfs_wapbl.c,v 1.1 2013/06/06 00:40:55 dholland Exp $ */
+/* $NetBSD: ulfs_wapbl.c,v 1.2 2013/06/06 00:44:41 dholland Exp $ */
/* from NetBSD: ufs_wapbl.c,v 1.23 2012/01/27 19:22:50 para Exp */
/*-
@@ -67,7 +67,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ulfs_wapbl.c,v 1.1 2013/06/06 00:40:55 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ulfs_wapbl.c,v 1.2 2013/06/06 00:44:41 dholland Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -89,13 +89,13 @@ __KERNEL_RCSID(0, "$NetBSD: ulfs_wapbl.c
#include <miscfs/specfs/specdev.h>
#include <miscfs/fifofs/fifo.h>
-#include <ufs/ufs/quota.h>
-#include <ufs/ufs/inode.h>
-#include <ufs/ufs/dir.h>
-#include <ufs/ufs/ufsmount.h>
-#include <ufs/ufs/ufs_bswap.h>
-#include <ufs/ufs/ufs_extern.h>
-#include <ufs/ufs/ufs_wapbl.h>
+#include <ufs/lfs/ulfs_quotacommon.h>
+#include <ufs/lfs/ulfs_inode.h>
+#include <ufs/lfs/ulfs_dir.h>
+#include <ufs/lfs/ulfsmount.h>
+#include <ufs/lfs/ulfs_bswap.h>
+#include <ufs/lfs/ulfs_extern.h>
+#include <ufs/lfs/ulfs_wapbl.h>
#include <ufs/ext2fs/ext2fs_extern.h>
#include <ufs/lfs/lfs_extern.h>
Index: src/sys/ufs/lfs/ulfsmount.h
diff -u src/sys/ufs/lfs/ulfsmount.h:1.1 src/sys/ufs/lfs/ulfsmount.h:1.2
--- src/sys/ufs/lfs/ulfsmount.h:1.1 Thu Jun 6 00:40:55 2013
+++ src/sys/ufs/lfs/ulfsmount.h Thu Jun 6 00:44:41 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: ulfsmount.h,v 1.1 2013/06/06 00:40:55 dholland Exp $ */
+/* $NetBSD: ulfsmount.h,v 1.2 2013/06/06 00:44:41 dholland Exp $ */
/* from NetBSD: ufsmount.h,v 1.39 2012/10/19 17:09:08 drochner Exp */
/*
@@ -62,8 +62,8 @@ struct mfs_args {
#include <sys/mutex.h>
-#include <ufs/ufs/extattr.h>
-#include <ufs/ufs/quota.h>
+#include <ufs/lfs/ulfs_extattr.h>
+#include <ufs/lfs/ulfs_quotacommon.h>
struct buf;
struct inode;
