[src/trunk]: src/sys/ufs/lfs Split lfs from ufs, part 2:

[dholland <dholland%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/e428cbf63cf9
branches:  trunk
changeset: 787199:e428cbf63cf9
user:      dholland <dholland%NetBSD.org@localhost>
date:      Thu Jun 06 00:44:40 2013 +0000

description:
Split lfs from ufs, part 2:

Change all <ufs/ufs/foo.h> includes to <ufs/lfs/ulfs_foo.h>.

diffstat:

 sys/ufs/lfs/lfs_alloc.c        |  12 ++++++------
 sys/ufs/lfs/lfs_balloc.c       |  12 ++++++------
 sys/ufs/lfs/lfs_bio.c          |  10 +++++-----
 sys/ufs/lfs/lfs_cksum.c        |   6 +++---
 sys/ufs/lfs/lfs_debug.c        |   6 +++---
 sys/ufs/lfs/lfs_inode.c        |  12 ++++++------
 sys/ufs/lfs/lfs_itimes.c       |   6 +++---
 sys/ufs/lfs/lfs_rfw.c          |  12 ++++++------
 sys/ufs/lfs/lfs_segment.c      |  12 ++++++------
 sys/ufs/lfs/lfs_subr.c         |   6 +++---
 sys/ufs/lfs/lfs_syscalls.c     |  10 +++++-----
 sys/ufs/lfs/lfs_vfsops.c       |  12 ++++++------
 sys/ufs/lfs/lfs_vnops.c        |  16 ++++++++--------
 sys/ufs/lfs/ulfs_bmap.c        |  12 ++++++------
 sys/ufs/lfs/ulfs_dirhash.c     |  16 ++++++++--------
 sys/ufs/lfs/ulfs_extattr.c     |  16 ++++++++--------
 sys/ufs/lfs/ulfs_ihash.c       |   8 ++++----
 sys/ufs/lfs/ulfs_inode.c       |  16 ++++++++--------
 sys/ufs/lfs/ulfs_inode.h       |   8 ++++----
 sys/ufs/lfs/ulfs_lookup.c      |  18 +++++++++---------
 sys/ufs/lfs/ulfs_quota.c       |  14 +++++++-------
 sys/ufs/lfs/ulfs_quota.h       |   6 +++---
 sys/ufs/lfs/ulfs_quota1.c      |  14 +++++++-------
 sys/ufs/lfs/ulfs_quota1.h      |   4 ++--
 sys/ufs/lfs/ulfs_quota1_subr.c |   6 +++---
 sys/ufs/lfs/ulfs_quota2.c      |  18 +++++++++---------
 sys/ufs/lfs/ulfs_quota2.h      |   4 ++--
 sys/ufs/lfs/ulfs_quota2_subr.c |  10 +++++-----
 sys/ufs/lfs/ulfs_rename.c      |  16 ++++++++--------
 sys/ufs/lfs/ulfs_vfsops.c      |  14 +++++++-------
 sys/ufs/lfs/ulfs_vnops.c       |  18 +++++++++---------
 sys/ufs/lfs/ulfs_wapbl.c       |  18 +++++++++---------
 sys/ufs/lfs/ulfsmount.h        |   6 +++---
 33 files changed, 187 insertions(+), 187 deletions(-)

diffs (truncated from 1042 to 300 lines):

diff -r 05b3b3cf4e43 -r e428cbf63cf9 sys/ufs/lfs/lfs_alloc.c
--- a/sys/ufs/lfs/lfs_alloc.c   Thu Jun 06 00:40:55 2013 +0000
+++ b/sys/ufs/lfs/lfs_alloc.c   Thu Jun 06 00:44:40 2013 +0000
@@ -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 @@
 #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>
diff -r 05b3b3cf4e43 -r e428cbf63cf9 sys/ufs/lfs/lfs_balloc.c
--- a/sys/ufs/lfs/lfs_balloc.c  Thu Jun 06 00:40:55 2013 +0000
+++ b/sys/ufs/lfs/lfs_balloc.c  Thu Jun 06 00:44:40 2013 +0000
@@ -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 @@
 
 #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>
diff -r 05b3b3cf4e43 -r e428cbf63cf9 sys/ufs/lfs/lfs_bio.c
--- a/sys/ufs/lfs/lfs_bio.c     Thu Jun 06 00:40:55 2013 +0000
+++ b/sys/ufs/lfs/lfs_bio.c     Thu Jun 06 00:44:40 2013 +0000
@@ -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 @@
 #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>
diff -r 05b3b3cf4e43 -r e428cbf63cf9 sys/ufs/lfs/lfs_cksum.c
--- a/sys/ufs/lfs/lfs_cksum.c   Thu Jun 06 00:40:55 2013 +0000
+++ b/sys/ufs/lfs/lfs_cksum.c   Thu Jun 06 00:44:40 2013 +0000
@@ -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 @@
 # 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>
 
diff -r 05b3b3cf4e43 -r e428cbf63cf9 sys/ufs/lfs/lfs_debug.c
--- a/sys/ufs/lfs/lfs_debug.c   Thu Jun 06 00:40:55 2013 +0000
+++ b/sys/ufs/lfs/lfs_debug.c   Thu Jun 06 00:44:40 2013 +0000
@@ -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 @@
 #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>
 
diff -r 05b3b3cf4e43 -r e428cbf63cf9 sys/ufs/lfs/lfs_inode.c
--- a/sys/ufs/lfs/lfs_inode.c   Thu Jun 06 00:40:55 2013 +0000
+++ b/sys/ufs/lfs/lfs_inode.c   Thu Jun 06 00:44:40 2013 +0000
@@ -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 @@
 #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>
diff -r 05b3b3cf4e43 -r e428cbf63cf9 sys/ufs/lfs/lfs_itimes.c
--- a/sys/ufs/lfs/lfs_itimes.c  Thu Jun 06 00:40:55 2013 +0000
+++ b/sys/ufs/lfs/lfs_itimes.c  Thu Jun 06 00:44:40 2013 +0000
@@ -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"
diff -r 05b3b3cf4e43 -r e428cbf63cf9 sys/ufs/lfs/lfs_rfw.c
--- a/sys/ufs/lfs/lfs_rfw.c     Thu Jun 06 00:40:55 2013 +0000
+++ b/sys/ufs/lfs/lfs_rfw.c     Thu Jun 06 00:44:40 2013 +0000
@@ -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 @@
 
 #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>
diff -r 05b3b3cf4e43 -r e428cbf63cf9 sys/ufs/lfs/lfs_segment.c
--- a/sys/ufs/lfs/lfs_segment.c Thu Jun 06 00:40:55 2013 +0000
+++ b/sys/ufs/lfs/lfs_segment.c Thu Jun 06 00:44:40 2013 +0000
@@ -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 @@
 #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>
diff -r 05b3b3cf4e43 -r e428cbf63cf9 sys/ufs/lfs/lfs_subr.c
--- a/sys/ufs/lfs/lfs_subr.c    Thu Jun 06 00:40:55 2013 +0000
+++ b/sys/ufs/lfs/lfs_subr.c    Thu Jun 06 00:44:40 2013 +0000
@@ -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 @@
 #include <sys/proc.h>
 #include <sys/kauth.h>
 
-#include <ufs/ufs/inode.h>
+#include <ufs/lfs/ulfs_inode.h>