[src/trunk]: src/sys/ufs/lfs ulfs_dir.h has been emptied; remove it.

To: source-changes-hg%NetBSD.org@localhost
Subject: [src/trunk]: src/sys/ufs/lfs ulfs_dir.h has been emptied; remove it.
From: dholland <dholland%NetBSD.org@localhost>
Date: Tue, 07 Apr 2020 00:44:04 +0000
details:   https://anonhg.NetBSD.org/src/rev/2d9c778bb390
branches:  trunk
changeset: 787264:2d9c778bb390
user:      dholland <dholland%NetBSD.org@localhost>
date:      Sat Jun 08 22:23:52 2013 +0000

description:
ulfs_dir.h has been emptied; remove it.

diffstat:

 sys/ufs/lfs/lfs.h          |   4 ++--
 sys/ufs/lfs/lfs_segment.c  |   5 ++---
 sys/ufs/lfs/lfs_vnops.c    |   5 ++---
 sys/ufs/lfs/ulfs_dir.h     |  43 -------------------------------------------
 sys/ufs/lfs/ulfs_dirhash.c |   5 ++---
 sys/ufs/lfs/ulfs_extattr.c |   5 ++---
 sys/ufs/lfs/ulfs_inode.h   |   3 +--
 sys/ufs/lfs/ulfs_lookup.c  |   5 ++---
 sys/ufs/lfs/ulfs_rename.c  |   5 ++---
 sys/ufs/lfs/ulfs_vnops.c   |   5 ++---
 10 files changed, 17 insertions(+), 68 deletions(-)

diffs (264 lines):

diff -r 96b997d982fc -r 2d9c778bb390 sys/ufs/lfs/lfs.h
--- a/sys/ufs/lfs/lfs.h Sat Jun 08 22:19:01 2013 +0000
+++ b/sys/ufs/lfs/lfs.h Sat Jun 08 22:23:52 2013 +0000
@@ -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 @@
 #define        LFS_DT_WHT      14
 
 /*
- * (See notes in ulfs_dir.h)
+ * (See notes above)
  */
 #define d_ino d_fileno
 struct lfs_direct {
diff -r 96b997d982fc -r 2d9c778bb390 sys/ufs/lfs/lfs_segment.c
--- a/sys/ufs/lfs/lfs_segment.c Sat Jun 08 22:19:01 2013 +0000
+++ b/sys/ufs/lfs/lfs_segment.c Sat Jun 08 22:23:52 2013 +0000
@@ -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 @@
 #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>
 
diff -r 96b997d982fc -r 2d9c778bb390 sys/ufs/lfs/lfs_vnops.c
--- a/sys/ufs/lfs/lfs_vnops.c   Sat Jun 08 22:19:01 2013 +0000
+++ b/sys/ufs/lfs/lfs_vnops.c   Sat Jun 08 22:23:52 2013 +0000
@@ -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 @@
 #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>
diff -r 96b997d982fc -r 2d9c778bb390 sys/ufs/lfs/ulfs_dir.h
--- a/sys/ufs/lfs/ulfs_dir.h    Sat Jun 08 22:19:01 2013 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,43 +0,0 @@
-/*     $NetBSD: ulfs_dir.h,v 1.8 2013/06/08 02:15:12 dholland Exp $    */
-/*  from NetBSD: dir.h,v 1.21 2009/07/22 04:49:19 dholland Exp  */
-
-/*
- * Copyright (c) 1982, 1986, 1989, 1993
- *     The Regents of the University of California.  All rights reserved.
- * (c) UNIX System Laboratories, Inc.
- * All or some portions of this file are derived from material licensed
- * to the University of California by American Telephone and Telegraph
- * Co. or Unix System Laboratories, Inc. and are reproduced herein with
- * the permission of UNIX System Laboratories, Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *     @(#)dir.h       8.5 (Berkeley) 4/27/95
- */
-
-#ifndef _UFS_LFS_ULFS_DIR_H_
-#define        _UFS_LFS_ULFS_DIR_H_
-
-#endif /* !_UFS_LFS_ULFS_DIR_H_ */
diff -r 96b997d982fc -r 2d9c778bb390 sys/ufs/lfs/ulfs_dirhash.c
--- a/sys/ufs/lfs/ulfs_dirhash.c        Sat Jun 08 22:19:01 2013 +0000
+++ b/sys/ufs/lfs/ulfs_dirhash.c        Sat Jun 08 22:23:52 2013 +0000
@@ -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 @@
 #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>
diff -r 96b997d982fc -r 2d9c778bb390 sys/ufs/lfs/ulfs_extattr.c
--- a/sys/ufs/lfs/ulfs_extattr.c        Sat Jun 08 22:19:01 2013 +0000
+++ b/sys/ufs/lfs/ulfs_extattr.c        Sat Jun 08 22:23:52 2013 +0000
@@ -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 @@
 #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>
diff -r 96b997d982fc -r 2d9c778bb390 sys/ufs/lfs/ulfs_inode.h
--- a/sys/ufs/lfs/ulfs_inode.h  Sat Jun 08 22:19:01 2013 +0000
+++ b/sys/ufs/lfs/ulfs_inode.h  Sat Jun 08 22:23:52 2013 +0000
@@ -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)
diff -r 96b997d982fc -r 2d9c778bb390 sys/ufs/lfs/ulfs_lookup.c
--- a/sys/ufs/lfs/ulfs_lookup.c Sat Jun 08 22:19:01 2013 +0000
+++ b/sys/ufs/lfs/ulfs_lookup.c Sat Jun 08 22:23:52 2013 +0000
@@ -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 @@
 #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
diff -r 96b997d982fc -r 2d9c778bb390 sys/ufs/lfs/ulfs_rename.c
--- a/sys/ufs/lfs/ulfs_rename.c Sat Jun 08 22:19:01 2013 +0000
+++ b/sys/ufs/lfs/ulfs_rename.c Sat Jun 08 22:23:52 2013 +0000
@@ -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 @@
 
 #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>
diff -r 96b997d982fc -r 2d9c778bb390 sys/ufs/lfs/ulfs_vnops.c
--- a/sys/ufs/lfs/ulfs_vnops.c  Sat Jun 08 22:19:01 2013 +0000
+++ b/sys/ufs/lfs/ulfs_vnops.c  Sat Jun 08 22:23:52 2013 +0000
@@ -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 @@
 #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>
Prev by Date: [src/trunk]: src/sys/ufs/lfs Remove stale union and accessor macros.
Next by Date: [src/trunk]: src/sys/ufs/lfs G/C another unneeded union
Previous by Thread: [src/trunk]: src/sys/ufs/lfs Remove stale union and accessor macros.
Next by Thread: [src/trunk]: src/sys/ufs/lfs G/C another unneeded union
Indexes:
Home | Main Index | Thread Index | Old Index