summaryrefslogtreecommitdiffstats
path: root/sys/gnu/fs
diff options
context:
space:
mode:
authorbde <bde@FreeBSD.org>1997-04-01 08:02:00 +0000
committerbde <bde@FreeBSD.org>1997-04-01 08:02:00 +0000
commitd6083d03a2f16f0add0411ba464174bd5100690c (patch)
treec0aecda786285a90996d449c90ef1a50f0d8592f /sys/gnu/fs
parentc2086a6f985ff2bdbae28fc1ed82af80dea48cda (diff)
downloadFreeBSD-src-d6083d03a2f16f0add0411ba464174bd5100690c.zip
FreeBSD-src-d6083d03a2f16f0add0411ba464174bd5100690c.tar.gz
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.
Diffstat (limited to 'sys/gnu/fs')
-rw-r--r--sys/gnu/fs/ext2fs/inode.h8
1 files changed, 6 insertions, 2 deletions
diff --git a/sys/gnu/fs/ext2fs/inode.h b/sys/gnu/fs/ext2fs/inode.h
index 3346cec..238f838 100644
--- a/sys/gnu/fs/ext2fs/inode.h
+++ b/sys/gnu/fs/ext2fs/inode.h
@@ -36,16 +36,20 @@
* 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
* is the information that is needed only while the file is active (such as
OpenPOWER on IntegriCloud