patch-2.2.18 linux/include/linux/adfs_fs_sb.h

• Lines: 57
• Date: Fri Sep 15 23:24:41 2000
• Orig file: v2.2.17/include/linux/adfs_fs_sb.h
• Orig date: Fri Apr 21 23:10:16 2000

diff -u --new-file --recursive --exclude-from /usr/src/exclude v2.2.17/include/linux/adfs_fs_sb.h linux/include/linux/adfs_fs_sb.h
@@ -1,33 +1,38 @@
 /*
  *  linux/include/linux/adfs_fs_sb.h
  *
- * Copyright (C) 1997 Russell King
+ * Copyright (C) 1997-1999 Russell King
  */
 
 #ifndef _ADFS_FS_SB
 #define _ADFS_FS_SB
 
-#include <linux/adfs_fs.h>
+/*
+ * Forward-declare this
+ */
+struct adfs_discmap;
+struct adfs_dir_ops;
 
 /*
- * adfs file system superblock data in memory
+ * ADFS file system superblock data in memory
  */
 struct adfs_sb_info {
-	struct buffer_head *s_sbh;	/* buffer head containing disc record	 */
-	struct adfs_discrecord *s_dr;	/* pointer to disc record in s_sbh	 */
-	uid_t	s_uid;			/* owner uid				 */
-	gid_t	s_gid;			/* owner gid				 */
-	int	s_owner_mask;		/* ADFS Owner perm -> unix perm		 */
-	int	s_other_mask;		/* ADFS Other perm -> unix perm		 */
-	__u16	s_zone_size;		/* size of a map zone in bits		 */
-	__u16	s_ids_per_zone;		/* max. no ids in one zone		 */
-	__u32	s_idlen;		/* length of ID in map			 */
-	__u32	s_map_size;		/* size of a map			 */
-	__u32	s_zonesize;		/* zone size (in map bits)		 */
-	__u32	s_map_block;		/* block address of map			 */
-	struct buffer_head **s_map;	/* bh list containing map		 */
-	__u32	s_root;			/* root disc address			 */
-	__s8	s_map2blk;		/* shift left by this for map->sector	 */
+	struct adfs_discmap *s_map;	/* bh list containing map		 */
+	struct adfs_dir_ops *s_dir;	/* directory operations			 */
+
+	uid_t		s_uid;		/* owner uid				 */
+	gid_t		s_gid;		/* owner gid				 */
+	umode_t		s_owner_mask;	/* ADFS owner perm -> unix perm		 */
+	umode_t		s_other_mask;	/* ADFS other perm -> unix perm		 */
+
+	__u32		s_ids_per_zone;	/* max. no ids in one zone		 */
+	__u32		s_idlen;	/* length of ID in map			 */
+	__u32		s_map_size;	/* sector size of a map			 */
+	unsigned long	s_size;		/* total size (in blocks) of this fs	 */
+	signed int	s_map2blk;	/* shift left by this for map->sector	 */
+	unsigned int	s_log2sharesize;/* log2 share size			 */
+	unsigned int	s_version;	/* disc format version			 */
+	unsigned int	s_namelen;	/* maximum number of characters in name	 */
 };
 
 #endif