Module Name: src
Committed By: dholland
Date: Sat Jun 8 22:23:52 UTC 2013
Modified Files:
src/sys/ufs/lfs: lfs.h lfs_segment.c lfs_vnops.c ulfs_dirhash.c
ulfs_extattr.c ulfs_inode.h ulfs_lookup.c ulfs_rename.c
ulfs_vnops.c
Removed Files:
src/sys/ufs/lfs: ulfs_dir.h
Log Message:
ulfs_dir.h has been emptied; remove it.
To generate a diff of this commit:
cvs rdiff -u -r1.149 -r1.150 src/sys/ufs/lfs/lfs.h
cvs rdiff -u -r1.228 -r1.229 src/sys/ufs/lfs/lfs_segment.c
cvs rdiff -u -r1.246 -r1.247 src/sys/ufs/lfs/lfs_vnops.c
cvs rdiff -u -r1.8 -r0 src/sys/ufs/lfs/ulfs_dir.h
cvs rdiff -u -r1.5 -r1.6 src/sys/ufs/lfs/ulfs_dirhash.c \
src/sys/ufs/lfs/ulfs_extattr.c
cvs rdiff -u -r1.6 -r1.7 src/sys/ufs/lfs/ulfs_inode.h
cvs rdiff -u -r1.10 -r1.11 src/sys/ufs/lfs/ulfs_lookup.c
cvs rdiff -u -r1.7 -r1.8 src/sys/ufs/lfs/ulfs_rename.c
cvs rdiff -u -r1.12 -r1.13 src/sys/ufs/lfs/ulfs_vnops.c
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.h
diff -u src/sys/ufs/lfs/lfs.h:1.149 src/sys/ufs/lfs/lfs.h:1.150
--- src/sys/ufs/lfs/lfs.h:1.149 Sat Jun 8 22:19:01 2013
+++ src/sys/ufs/lfs/lfs.h Sat Jun 8 22:23:52 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: lfs.h,v 1.149 2013/06/08 22:19:01 dholland Exp $ */
+/* $NetBSD: lfs.h,v 1.150 2013/06/08 22:23:52 dholland Exp $ */
/* from NetBSD: dinode.h,v 1.22 2013/01/22 09:39:18 dholland Exp */
/* from NetBSD: dir.h,v 1.21 2009/07/22 04:49:19 dholland Exp */
@@ -373,7 +373,7 @@ typedef struct lfs_res_blk {
#define LFS_DT_WHT 14
/*
- * (See notes in ulfs_dir.h)
+ * (See notes above)
*/
#define d_ino d_fileno
struct lfs_direct {
Index: src/sys/ufs/lfs/lfs_segment.c
diff -u src/sys/ufs/lfs/lfs_segment.c:1.228 src/sys/ufs/lfs/lfs_segment.c:1.229
--- src/sys/ufs/lfs/lfs_segment.c:1.228 Sat Jun 8 02:11:11 2013
+++ src/sys/ufs/lfs/lfs_segment.c Sat Jun 8 22:23:52 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: lfs_segment.c,v 1.228 2013/06/08 02:11:11 dholland Exp $ */
+/* $NetBSD: lfs_segment.c,v 1.229 2013/06/08 22:23:52 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.228 2013/06/08 02:11:11 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lfs_segment.c,v 1.229 2013/06/08 22:23:52 dholland Exp $");
#ifdef DEBUG
# define vndebug(vp, str) do { \
@@ -96,7 +96,6 @@ __KERNEL_RCSID(0, "$NetBSD: lfs_segment.
#include <miscfs/fifofs/fifo.h>
#include <ufs/lfs/ulfs_inode.h>
-#include <ufs/lfs/ulfs_dir.h>
#include <ufs/lfs/ulfsmount.h>
#include <ufs/lfs/ulfs_extern.h>
Index: src/sys/ufs/lfs/lfs_vnops.c
diff -u src/sys/ufs/lfs/lfs_vnops.c:1.246 src/sys/ufs/lfs/lfs_vnops.c:1.247
--- src/sys/ufs/lfs/lfs_vnops.c:1.246 Sat Jun 8 02:11:11 2013
+++ src/sys/ufs/lfs/lfs_vnops.c Sat Jun 8 22:23:52 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: lfs_vnops.c,v 1.246 2013/06/08 02:11:11 dholland Exp $ */
+/* $NetBSD: lfs_vnops.c,v 1.247 2013/06/08 22:23:52 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.246 2013/06/08 02:11:11 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lfs_vnops.c,v 1.247 2013/06/08 22:23:52 dholland Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@@ -89,7 +89,6 @@ __KERNEL_RCSID(0, "$NetBSD: lfs_vnops.c,
#include <miscfs/specfs/specdev.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>
Index: src/sys/ufs/lfs/ulfs_dirhash.c
diff -u src/sys/ufs/lfs/ulfs_dirhash.c:1.5 src/sys/ufs/lfs/ulfs_dirhash.c:1.6
--- src/sys/ufs/lfs/ulfs_dirhash.c:1.5 Sat Jun 8 02:14:46 2013
+++ src/sys/ufs/lfs/ulfs_dirhash.c Sat Jun 8 22:23:52 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: ulfs_dirhash.c,v 1.5 2013/06/08 02:14:46 dholland Exp $ */
+/* $NetBSD: ulfs_dirhash.c,v 1.6 2013/06/08 22:23:52 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.5 2013/06/08 02:14:46 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ulfs_dirhash.c,v 1.6 2013/06/08 22:23:52 dholland Exp $");
/*
* This implements a hash-based lookup scheme for ULFS directories.
@@ -50,7 +50,6 @@ __KERNEL_RCSID(0, "$NetBSD: ulfs_dirhash
#include <sys/atomic.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>
Index: src/sys/ufs/lfs/ulfs_extattr.c
diff -u src/sys/ufs/lfs/ulfs_extattr.c:1.5 src/sys/ufs/lfs/ulfs_extattr.c:1.6
--- src/sys/ufs/lfs/ulfs_extattr.c:1.5 Sat Jun 8 02:14:46 2013
+++ src/sys/ufs/lfs/ulfs_extattr.c Sat Jun 8 22:23:52 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: ulfs_extattr.c,v 1.5 2013/06/08 02:14:46 dholland Exp $ */
+/* $NetBSD: ulfs_extattr.c,v 1.6 2013/06/08 22:23:52 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.5 2013/06/08 02:14:46 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ulfs_extattr.c,v 1.6 2013/06/08 22:23:52 dholland Exp $");
#ifdef _KERNEL_OPT
#include "opt_lfs.h"
@@ -71,7 +71,6 @@ __KERNEL_RCSID(0, "$NetBSD: ulfs_extattr
#include <sys/extattr.h>
#include <sys/sysctl.h>
-#include <ufs/lfs/ulfs_dir.h>
#include <ufs/lfs/ulfs_extattr.h>
#include <ufs/lfs/ulfsmount.h>
#include <ufs/lfs/ulfs_inode.h>
Index: src/sys/ufs/lfs/ulfs_inode.h
diff -u src/sys/ufs/lfs/ulfs_inode.h:1.6 src/sys/ufs/lfs/ulfs_inode.h:1.7
--- src/sys/ufs/lfs/ulfs_inode.h:1.6 Sat Jun 8 02:04:31 2013
+++ src/sys/ufs/lfs/ulfs_inode.h Sat Jun 8 22:23:52 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: ulfs_inode.h,v 1.6 2013/06/08 02:04:31 dholland Exp $ */
+/* $NetBSD: ulfs_inode.h,v 1.7 2013/06/08 22:23:52 dholland Exp $ */
/* from NetBSD: inode.h,v 1.64 2012/11/19 00:36:21 jakllsch Exp */
/*
@@ -43,7 +43,6 @@
#include <sys/vnode.h>
#include <ufs/lfs/lfs_inode.h>
#include <ufs/lfs/ulfs_dinode.h>
-#include <ufs/lfs/ulfs_dir.h>
#include <ufs/lfs/ulfs_quotacommon.h>
#if defined(_KERNEL)
Index: src/sys/ufs/lfs/ulfs_lookup.c
diff -u src/sys/ufs/lfs/ulfs_lookup.c:1.10 src/sys/ufs/lfs/ulfs_lookup.c:1.11
--- src/sys/ufs/lfs/ulfs_lookup.c:1.10 Sat Jun 8 22:05:15 2013
+++ src/sys/ufs/lfs/ulfs_lookup.c Sat Jun 8 22:23:52 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: ulfs_lookup.c,v 1.10 2013/06/08 22:05:15 dholland Exp $ */
+/* $NetBSD: ulfs_lookup.c,v 1.11 2013/06/08 22:23:52 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.10 2013/06/08 22:05:15 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ulfs_lookup.c,v 1.11 2013/06/08 22:23:52 dholland Exp $");
#ifdef _KERNEL_OPT
#include "opt_lfs.h"
@@ -60,7 +60,6 @@ __KERNEL_RCSID(0, "$NetBSD: ulfs_lookup.
#include <sys/kmem.h>
#include <ufs/lfs/ulfs_inode.h>
-#include <ufs/lfs/ulfs_dir.h>
#ifdef LFS_DIRHASH
#include <ufs/lfs/ulfs_dirhash.h>
#endif
Index: src/sys/ufs/lfs/ulfs_rename.c
diff -u src/sys/ufs/lfs/ulfs_rename.c:1.7 src/sys/ufs/lfs/ulfs_rename.c:1.8
--- src/sys/ufs/lfs/ulfs_rename.c:1.7 Sat Jun 8 22:05:15 2013
+++ src/sys/ufs/lfs/ulfs_rename.c Sat Jun 8 22:23:52 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: ulfs_rename.c,v 1.7 2013/06/08 22:05:15 dholland Exp $ */
+/* $NetBSD: ulfs_rename.c,v 1.8 2013/06/08 22:23:52 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.7 2013/06/08 22:05:15 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ulfs_rename.c,v 1.8 2013/06/08 22:23:52 dholland Exp $");
#include <sys/param.h>
#include <sys/buf.h>
@@ -51,7 +51,6 @@ __KERNEL_RCSID(0, "$NetBSD: ulfs_rename.
#include <miscfs/genfs/genfs.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>
Index: src/sys/ufs/lfs/ulfs_vnops.c
diff -u src/sys/ufs/lfs/ulfs_vnops.c:1.12 src/sys/ufs/lfs/ulfs_vnops.c:1.13
--- src/sys/ufs/lfs/ulfs_vnops.c:1.12 Sat Jun 8 22:05:15 2013
+++ src/sys/ufs/lfs/ulfs_vnops.c Sat Jun 8 22:23:52 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: ulfs_vnops.c,v 1.12 2013/06/08 22:05:15 dholland Exp $ */
+/* $NetBSD: ulfs_vnops.c,v 1.13 2013/06/08 22:23:52 dholland Exp $ */
/* from NetBSD: ufs_vnops.c,v 1.213 2013/06/08 05:47:02 kardel Exp */
/*-
@@ -67,7 +67,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ulfs_vnops.c,v 1.12 2013/06/08 22:05:15 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ulfs_vnops.c,v 1.13 2013/06/08 22:23:52 dholland Exp $");
#if defined(_KERNEL_OPT)
#include "opt_lfs.h"
@@ -98,7 +98,6 @@ __KERNEL_RCSID(0, "$NetBSD: ulfs_vnops.c
#include <miscfs/genfs/genfs.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>
