patch-2.4.6 linux/include/linux/sysv_fs_sb.h

• Lines: 120
• Date: Mon Jul 2 14:03:04 2001
• Orig file: v2.4.5/linux/include/linux/sysv_fs_sb.h
• Orig date: Sun Sep 13 10:27:07 1998

diff -u --recursive --new-file v2.4.5/linux/include/linux/sysv_fs_sb.h linux/include/linux/sysv_fs_sb.h
@@ -2,8 +2,8 @@
 #define _SYSV_FS_SB
 
 /*
- * SystemV/Coherent super-block data in memory
- * The SystemV/Coherent superblock contains dynamic data (it gets modified
+ * SystemV/V7/Coherent super-block data in memory
+ * The SystemV/V7/Coherent superblock contains dynamic data (it gets modified
  * while the system is running). This is in contrast to the Minix and Berkeley
  * filesystems (where the superblock is never modified). This affects the
  * sync() operation: we must keep the superblock in a disk buffer and use this
@@ -12,12 +12,7 @@
 
 struct sysv_sb_info {
 	int	       s_type;		/* file system type: FSTYPE_{XENIX|SYSV|COH} */
-	unsigned int   s_block_size;	/* zone size, = 512 or = 1024 */
-	unsigned int   s_block_size_1;	/* block_size - 1 */
-	unsigned int   s_block_size_bits;	/* log2(block_size) */
-	unsigned int   s_block_size_inc_bits;	/* log2(block_size/BLOCK_SIZE) if >0 */
-	unsigned int   s_block_size_dec_bits;	/* log2(BLOCK_SIZE/block_size) if >0 */
-	char	       s_convert;	/* flag whether byte ordering requires conversion */
+	char	       s_bytesex;	/* bytesex (le/be/pdp) */
 	char	       s_kludge_symlinks; /* flag whether symlinks have a kludgey mode */
 	char	       s_truncate;	/* if 1: names > SYSV_NAMELEN chars are truncated */
 					/* if 0: they are disallowed (ENAMETOOLONG) */
@@ -26,19 +21,8 @@
 	unsigned int   s_inodes_per_block_1;	/* inodes_per_block - 1 */
 	unsigned int   s_inodes_per_block_bits;	/* log2(inodes_per_block) */
 	unsigned int   s_ind_per_block;		/* number of indirections per block */
-	unsigned int   s_ind_per_block_1;	/* ind_per_block - 1 */
 	unsigned int   s_ind_per_block_bits;	/* log2(ind_per_block) */
 	unsigned int   s_ind_per_block_2;	/* ind_per_block ^ 2 */
-	unsigned int   s_ind_per_block_2_1;	/* ind_per_block ^ 2 - 1 */
-	unsigned int   s_ind_per_block_2_bits;	/* log2(ind_per_block^2) */
-	unsigned int   s_ind_per_block_3;	/* ind_per_block ^ 3 */
-	unsigned int   s_ind_per_block_block_size_1;	/* ind_per_block*block_size - 1 */
-	unsigned int   s_ind_per_block_block_size_bits;	/* log2(ind_per_block*block_size) */
-	unsigned int   s_ind_per_block_2_block_size_1;	/* ind_per_block^2 * block_size - 1 */
-	unsigned int   s_ind_per_block_2_block_size_bits; /* log2(ind_per_block^2 * block_size) */
-	unsigned int   s_ind0_size;		/* 10 * block_size */
-	unsigned int   s_ind1_size;		/* (10 + ipb) * block_size */
-	unsigned int   s_ind2_size;		/* (10 + ipb + ipb^2) * block_size */
 	unsigned int   s_toobig_block;		/* 10 + ipb + ipb^2 + ipb^3 */
 	unsigned int   s_block_base;	/* physical block number of block 0 */
 	unsigned short s_fic_size;	/* free inode cache size, NICINOD */
@@ -53,9 +37,9 @@
 	u16            *s_sb_fic_count;	/* pointer to s_sbd->s_ninode */
         u16            *s_sb_fic_inodes; /* pointer to s_sbd->s_inode */
 	u16            *s_sb_total_free_inodes; /* pointer to s_sbd->s_tinode */
-	u16            *s_sb_flc_count;	/* pointer to s_sbd->s_nfree */
-	u32	       *s_sb_flc_blocks; /* pointer to s_sbd->s_free */
-	u32            *s_sb_total_free_blocks;/* pointer to s_sbd->s_tfree */
+	u16            *s_bcache_count;	/* pointer to s_sbd->s_nfree */
+	u32	       *s_bcache;	/* pointer to s_sbd->s_free */
+	u32            *s_free_blocks;	/* pointer to s_sbd->s_tfree */
 	u32            *s_sb_time;	/* pointer to s_sbd->s_time */
 	u32            *s_sb_state;	/* pointer to s_sbd->s_state, only FSTYPE_SYSV */
 	/* We keep those superblock entities that don't change here;
@@ -65,17 +49,13 @@
 	u32            s_ninodes;	/* total number of inodes */
 	u32            s_ndatazones;	/* total number of data zones */
 	u32            s_nzones;	/* same as s_sbd->s_fsize */
+	u16	       s_namelen;       /* max length of dir entry */
 };
-/* The fields s_ind_per_block_2_1, s_toobig_block are currently unused. */
+/* The field s_toobig_block is currently unused. */
 
 /* sv_ == u.sysv_sb.s_ */
 #define sv_type					u.sysv_sb.s_type
-#define sv_block_size				u.sysv_sb.s_block_size
-#define sv_block_size_1				u.sysv_sb.s_block_size_1
-#define sv_block_size_bits			u.sysv_sb.s_block_size_bits
-#define sv_block_size_inc_bits			u.sysv_sb.s_block_size_inc_bits
-#define sv_block_size_dec_bits			u.sysv_sb.s_block_size_dec_bits
-#define sv_convert				u.sysv_sb.s_convert
+#define sv_bytesex				u.sysv_sb.s_bytesex
 #define sv_kludge_symlinks			u.sysv_sb.s_kludge_symlinks
 #define sv_truncate				u.sysv_sb.s_truncate
 #define sv_link_max				u.sysv_sb.s_link_max
@@ -83,19 +63,8 @@
 #define sv_inodes_per_block_1			u.sysv_sb.s_inodes_per_block_1
 #define sv_inodes_per_block_bits		u.sysv_sb.s_inodes_per_block_bits
 #define sv_ind_per_block			u.sysv_sb.s_ind_per_block
-#define sv_ind_per_block_1			u.sysv_sb.s_ind_per_block_1
 #define sv_ind_per_block_bits			u.sysv_sb.s_ind_per_block_bits
 #define sv_ind_per_block_2			u.sysv_sb.s_ind_per_block_2
-#define sv_ind_per_block_2_1			u.sysv_sb.s_ind_per_block_2_1
-#define sv_ind_per_block_2_bits			u.sysv_sb.s_ind_per_block_2_bits
-#define sv_ind_per_block_3			u.sysv_sb.s_ind_per_block_3
-#define sv_ind_per_block_block_size_1		u.sysv_sb.s_ind_per_block_block_size_1
-#define sv_ind_per_block_block_size_bits	u.sysv_sb.s_ind_per_block_block_size_bits
-#define sv_ind_per_block_2_block_size_1		u.sysv_sb.s_ind_per_block_2_block_size_1
-#define sv_ind_per_block_2_block_size_bits	u.sysv_sb.s_ind_per_block_2_block_size_bits
-#define sv_ind0_size				u.sysv_sb.s_ind0_size
-#define sv_ind1_size				u.sysv_sb.s_ind1_size
-#define sv_ind2_size				u.sysv_sb.s_ind2_size
 #define sv_toobig_block				u.sysv_sb.s_toobig_block
 #define sv_block_base				u.sysv_sb.s_block_base
 #define sv_fic_size				u.sysv_sb.s_fic_size
@@ -107,9 +76,9 @@
 #define sv_sb_fic_count				u.sysv_sb.s_sb_fic_count
 #define sv_sb_fic_inodes			u.sysv_sb.s_sb_fic_inodes
 #define sv_sb_total_free_inodes			u.sysv_sb.s_sb_total_free_inodes
-#define sv_sb_flc_count				u.sysv_sb.s_sb_flc_count
-#define sv_sb_flc_blocks			u.sysv_sb.s_sb_flc_blocks
-#define sv_sb_total_free_blocks			u.sysv_sb.s_sb_total_free_blocks
+#define sv_bcache_count				u.sysv_sb.s_bcache_count
+#define sv_bcache				u.sysv_sb.s_bcache
+#define sv_free_blocks				u.sysv_sb.s_free_blocks
 #define sv_sb_time				u.sysv_sb.s_sb_time
 #define sv_sb_state				u.sysv_sb.s_sb_state
 #define sv_firstinodezone			u.sysv_sb.s_firstinodezone
@@ -117,6 +86,6 @@
 #define sv_ninodes				u.sysv_sb.s_ninodes
 #define sv_ndatazones				u.sysv_sb.s_ndatazones
 #define sv_nzones				u.sysv_sb.s_nzones
+#define sv_namelen                              u.sysv_sb.s_namelen
 
 #endif
-