From 95e7aeb4e16a7f3be059335e268cfe002275ffa7 Mon Sep 17 00:00:00 2001
From: Bruce Evans <bde@FreeBSD.org>
Date: Tue, 1 Apr 1997 08:02:00 +0000
Subject: [PATCH] Removed nested include of <ufs/ufs/dir.h>.  Use the pre-Lite2
 hack of defining doff_t both here and in <ufs/ufs/dir.h> so that this file is
 independent of <ufs/ufs/dir.h>.  It still has old prerequisites <sys/param.h>
 and <ufs/ufs/quota.h>, and a new Lite2 prerequisite of <sys/lock.h>, sigh.

This might fix lsof, which was broken by namespace pollution giving
conflicting definitions of DIRBLKSIZ.
---
 sys/gnu/ext2fs/inode.h    | 8 ++++++--
 sys/gnu/fs/ext2fs/inode.h | 8 ++++++--
 sys/ufs/ufs/inode.h       | 8 ++++++--
 3 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/sys/gnu/ext2fs/inode.h b/sys/gnu/ext2fs/inode.h
index 3346cec2bb0..238f838a527 100644
--- a/sys/gnu/ext2fs/inode.h
+++ b/sys/gnu/ext2fs/inode.h
@@ -36,15 +36,19 @@
  * SUCH DAMAGE.
  *
  *	@(#)inode.h	8.9 (Berkeley) 5/14/95
- * $Id: inode.h,v 1.12 1997/02/22 09:47:42 peter Exp $
+ * $Id: inode.h,v 1.13 1997/03/03 16:25:46 bde Exp $
  */
 
 #ifndef _UFS_UFS_INODE_H_
 #define	_UFS_UFS_INODE_H_
 
-#include <ufs/ufs/dir.h>
 #include <ufs/ufs/dinode.h>
 
+/*
+ * This must agree with the definition in <ufs/ufs/dir.h>.
+ */
+#define	doff_t		int32_t
+
 /*
  * The inode is used to describe each active (or recently active) file in the
  * UFS filesystem. It is composed of two types of information. The first part
diff --git a/sys/gnu/fs/ext2fs/inode.h b/sys/gnu/fs/ext2fs/inode.h
index 3346cec2bb0..238f838a527 100644
--- a/sys/gnu/fs/ext2fs/inode.h
+++ b/sys/gnu/fs/ext2fs/inode.h
@@ -36,15 +36,19 @@
  * SUCH DAMAGE.
  *
  *	@(#)inode.h	8.9 (Berkeley) 5/14/95
- * $Id: inode.h,v 1.12 1997/02/22 09:47:42 peter Exp $
+ * $Id: inode.h,v 1.13 1997/03/03 16:25:46 bde Exp $
  */
 
 #ifndef _UFS_UFS_INODE_H_
 #define	_UFS_UFS_INODE_H_
 
-#include <ufs/ufs/dir.h>
 #include <ufs/ufs/dinode.h>
 
+/*
+ * This must agree with the definition in <ufs/ufs/dir.h>.
+ */
+#define	doff_t		int32_t
+
 /*
  * The inode is used to describe each active (or recently active) file in the
  * UFS filesystem. It is composed of two types of information. The first part
diff --git a/sys/ufs/ufs/inode.h b/sys/ufs/ufs/inode.h
index 3346cec2bb0..238f838a527 100644
--- a/sys/ufs/ufs/inode.h
+++ b/sys/ufs/ufs/inode.h
@@ -36,15 +36,19 @@
  * SUCH DAMAGE.
  *
  *	@(#)inode.h	8.9 (Berkeley) 5/14/95
- * $Id: inode.h,v 1.12 1997/02/22 09:47:42 peter Exp $
+ * $Id: inode.h,v 1.13 1997/03/03 16:25:46 bde Exp $
  */
 
 #ifndef _UFS_UFS_INODE_H_
 #define	_UFS_UFS_INODE_H_
 
-#include <ufs/ufs/dir.h>
 #include <ufs/ufs/dinode.h>
 
+/*
+ * This must agree with the definition in <ufs/ufs/dir.h>.
+ */
+#define	doff_t		int32_t
+
 /*
  * The inode is used to describe each active (or recently active) file in the
  * UFS filesystem. It is composed of two types of information. The first part