[LV-k25-commit] kernel-2.5/fs/ods2 ods2.h,1.5,1.6

[Jan-Benedict G. <jb...@us...>]

Update of /cvsroot/linux-vax/kernel-2.5/fs/ods2
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5603

Modified Files:
	ods2.h 
Log Message:
- Remove spaces.


Index: ods2.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/fs/ods2/ods2.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- ods2.h	20 Sep 2004 05:51:29 -0000	1.5
+++ ods2.h	20 Sep 2004 21:13:38 -0000	1.6
@@ -31,58 +31,58 @@
  * This is the home block on a ODS2 disk.
  */
 struct hm2def {
-	u32		     hm2_l_homelbn;
-	u32		     hm2_l_alhomelbn;
-	u32		     hm2_l_altidxlbn;
+	u32			hm2_l_homelbn;
+	u32			hm2_l_alhomelbn;
+	u32			hm2_l_altidxlbn;
 	union {
-		u16	     hm2_w_struclev;
+		u16		hm2_w_struclev;
 		struct {
-			u8   hm2_b_structlevv;
-			u8   hm2_b_structlevl;
-		} s1;
-	} u1;
-	u16		     hm2_w_cluster;
-	u16		     hm2_w_homevbn;
-	u16		     hm2_w_alhomevbn;
-	u16		     hm2_w_altidxvbn;
-	u16		     hm2_w_ibmapvbn;
-	u32		     hm2_l_ibmaplbn;
-	u32		     hm2_l_maxfiles;
-	u16		     hm2_w_ibmapsize;
-	u16		     hm2_w_resfiles;
-	u16		     hm2_w_devtype;
-	u16		     hm2_w_rvn;
-	u16		     hm2_w_setcount;
-	u16		     hm2_w_volchar;
+			u8	hm2_b_structlevv;
+			u8	hm2_b_structlevl;
+		}		s1;
+	}			u1;
+	u16			hm2_w_cluster;
+	u16			hm2_w_homevbn;
+	u16			hm2_w_alhomevbn;
+	u16			hm2_w_altidxvbn;
+	u16			hm2_w_ibmapvbn;
+	u32			hm2_l_ibmaplbn;
+	u32			hm2_l_maxfiles;
+	u16			hm2_w_ibmapsize;
+	u16			hm2_w_resfiles;
+	u16			hm2_w_devtype;
+	u16			hm2_w_rvn;
+	u16			hm2_w_setcount;
+	u16			hm2_w_volchar;
 	union {
-		u32	     hm2_l_owner;
+		u32		hm2_l_owner;
 		struct {
-			u16  hm2_w_mem;
-			u16  hm2_w_grp;
-		} s1;
-	} u2;
-	u32		     hm2_l_res1;
-	u16		     hm2_w_protect;
-	u16		     hm2_w_fileprot;
-	u16		     hm2_w_res2;
-	u16		     hm2_w_checksum1;
-	u32		     hm2_q_credate[2];
-	u8		     hm2_b_window;
-	u8		     hm2_b_lru_lim;
-	u16		     hm2_w_extend;
-	u32		     hm2_q_retainmin[2];
-	u32		     hm2_q_retainmax[2];
-	u32		     hm2_q_revdate[2];
-	u8		     hm2_r_min_class[20];
-	u8		     hm2_r_max_class[20];
-	u8		     hm2_b_res3[320];
-	u32		     hm2_l_serialnum;
-	char		     hm2_t_structname[12];
-	char		     hm2_t_volname[12];
-	char		     hm2_t_ownername[12];
-	char		     hm2_t_format[12];
-	u16		     hm2_w_res4;
-	u16		     hm2_w_checksum2;
+			u16	hm2_w_mem;
+			u16	hm2_w_grp;
+		} 		s1;
+	} 			u2;
+	u32			hm2_l_res1;
+	u16			hm2_w_protect;
+	u16			hm2_w_fileprot;
+	u16			hm2_w_res2;
+	u16			hm2_w_checksum1;
+	u32			hm2_q_credate[2];
+	u8			hm2_b_window;
+	u8			hm2_b_lru_lim;
+	u16			hm2_w_extend;
+	u32			hm2_q_retainmin[2];
+	u32			hm2_q_retainmax[2];
+	u32			hm2_q_revdate[2];
+	u8			hm2_r_min_class[20];
+	u8			hm2_r_max_class[20];
+	u8			hm2_b_res3[320];
+	u32			hm2_l_serialnum;
+	char			hm2_t_structname[12];
+	char			hm2_t_volname[12];
+	char			hm2_t_ownername[12];
+	char			hm2_t_format[12];
+	u16			hm2_w_res4;
+	u16			hm2_w_checksum2;
 };
 
 /*
@@ -91,47 +91,47 @@
  */
 struct scbdef {
 	union {
-		u16	     scb_w_struclev;
+		u16		scb_w_struclev;
 		struct {
-			u8   scb_b_structlevv;
-			u8   scb_b_structlevl;
-		} s1;
-	} u1;
-	u16		     scb_w_cluster;
-	u32		     scb_l_volsize;
-	u32		     scb_l_blksize;
-	u32		     scb_l_sectors;
-	u32		     scb_l_tracks;
-	u32		     scb_l_cylinders;
+			u8	scb_b_structlevv;
+			u8	scb_b_structlevl;
+		} 		s1;
+	} 			u1;
+	u16			scb_w_cluster;
+	u32			scb_l_volsize;
+	u32			scb_l_blksize;
+	u32			scb_l_sectors;
+	u32			scb_l_tracks;
+	u32			scb_l_cylinders;
 	union {
-		u32	     scb_l_status;
+		u32		scb_l_status;
 		struct {
-			u32  scb_v_mapdirty:1;
-			u32  scb_v_mapalloc:1;
-			u32  scb_v_filalloc:1;
-			u32  scb_v_quodirty:1;
-			u32  scb_v_hdrwrite:1;
-			u32  scb_v_corrupt:1;
-		} s1;
-	} u2;
+			u32	scb_v_mapdirty:1;
+			u32	scb_v_mapalloc:1;
+			u32	scb_v_filalloc:1;
+			u32	scb_v_quodirty:1;
+			u32	scb_v_hdrwrite:1;
+			u32	scb_v_corrupt:1;
+		} 		s1;
+	} 			u2;
 	union {
-		u32	     scb_l_status2;
+		u32		scb_l_status2;
 		struct {
-			u32  scb_v_mapdirty:1;
-			u32  scb_v_mapalloc:1;
-			u32  scb_v_filalloc:1;
-			u32  scb_v_quodirty:1;
-			u32  scb_v_hdrwrite:1;
-			u32  scb_v_corrupt:1;
-		} s1;
-	} u3;
-	u16		     scb_w_writecnt;
-	char		     scb_t_volockname[12];
-	u16		     scb_q_mounttime[4];
-	u16		     scb_w_backrev;
-	u64		     scb_q_genernum;
-	u8		     scb_b_reserved[446];
-	u16		     scb_w_checksum;
+			u32	scb_v_mapdirty:1;
+			u32	scb_v_mapalloc:1;
+			u32	scb_v_filalloc:1;
+			u32	scb_v_quodirty:1;
+			u32	scb_v_hdrwrite:1;
+			u32	scb_v_corrupt:1;
+		}		s1;
+	}			u3;
+	u16			scb_w_writecnt;
+	char			scb_t_volockname[12];
+	u16			scb_q_mounttime[4];
+	u16			scb_w_backrev;
+	u64			scb_q_genernum;
+	u8			scb_b_reserved[446];
+	u16			scb_w_checksum;
 };
 
 /*
@@ -139,13 +139,13 @@
  * fives different tomes as well as the file name.
  */
 struct fi2def {
-	char		     fi2_t_filename[20];
-	u16		     fi2_w_revision;
-	u16		     fi2_q_credate[4];
-	u16		     fi2_q_revdate[4];
-	u16		     fi2_q_expdate[4];
-	u16		     fi2_q_bakdate[4];
-	char		     fi_2_filenameext[66];
+	char	fi2_t_filename[20];
+	u16	fi2_w_revision;
+	u16	fi2_q_credate[4];
+	u16	fi2_q_revdate[4];
+	u16	fi2_q_expdate[4];
+	u16	fi2_q_bakdate[4];
+	char	fi_2_filenameext[66];
 };
 
 /*
@@ -153,86 +153,86 @@
  * It is located in file INDEXF.SYS.
  */
 struct fh2def {
-	u8		     fh2_b_idoffset;
-	u8		     fh2_b_mpoffset;
-	u8		     fh2_b_acoffset;
-	u8		     fh2_b_rsoffset;
-	u16		     fh2_w_seg_num;
+	u8			fh2_b_idoffset;
+	u8			fh2_b_mpoffset;
+	u8			fh2_b_acoffset;
+	u8			fh2_b_rsoffset;
+	u16			fh2_w_seg_num;
 	union {
-		u16	     fh2_w_struclev;
+		u16		fh2_w_struclev;
 		struct {
-			u8   fh2_b_structlevv;
-			u8   fh2_b_structlevl;
-		} s1;
-	} u1;
+			u8	fh2_b_structlevv;
+			u8	fh2_b_structlevl;
+		}		s1;
+	}			u1;
 	union {
-		u16	     fh2_w_fid[3];
+		u16		fh2_w_fid[3];
 		struct {
-			u16  fh2_w_fid_num;
-			u16  fh2_w_fid_seq;
-			u8   fh2_b_fid_rvn;
-			u8   fh2_b_fid_nmx;
-		} s1;
-	} u2;
+			u16	fh2_w_fid_num;
+			u16	fh2_w_fid_seq;
+			u8	fh2_b_fid_rvn;
+			u8	fh2_b_fid_nmx;
+		}		s1;
+	}			u2;
 	union {
-		u16	     fh2_w_ext_fid[3];
+		u16		fh2_w_ext_fid[3];
 		struct {
-			u16  fid_w_ex_fidnum;
-			u16  fid_w_ex_fidseq;
-			u8   fid_b_ex_fidrvn;
-			u8   fid_b_ex_fidnmx;
-		} s1;
-	} u3;
-	u32		     fh2_w_recattr[8];
+			u16	fid_w_ex_fidnum;
+			u16	fid_w_ex_fidseq;
+			u8	fid_b_ex_fidrvn;
+			u8	fid_b_ex_fidnmx;
+		}		s1;
+	}			u3;
+	u32			fh2_w_recattr[8];
 	union {
 		struct filechar {
-			u32  fch_v_wascontig:1;
-			u32  fch_v_nobackup:1;
-			u32  fch_v_writeback:1;
-			u32  fch_v_readcheck:1;
-			u32  fch_v_writecheck:1;
-			u32  fch_v_contigb:1;
-			u32  fch_v_locked:1;
-			u32  fch_v_contig:1;
-			u32  fch_v_res1:3;
-			u32  fch_v_badacl:1;
-			u32  fch_v_spool:1;
-			u32  fch_v_directory:1;
-			u32  fch_v_badblock:1;
-			u32  fch_v_markdel:1;
-			u32  fch_v_nocharge:1;
-			u32  fch_v_erase:1;
-		} s1;
-		u32	     fh2_l_filechar;
-	} u4;
-	u16		     fh2_w_res1;
-	u8		     fh2_b_map_inuse;
-	u8		     fh2_b_acc_mode;
+			u32	fch_v_wascontig:1;
+			u32	fch_v_nobackup:1;
+			u32	fch_v_writeback:1;
+			u32	fch_v_readcheck:1;
+			u32	fch_v_writecheck:1;
+			u32	fch_v_contigb:1;
+			u32	fch_v_locked:1;
+			u32	fch_v_contig:1;
+			u32	fch_v_res1:3;
+			u32	fch_v_badacl:1;
+			u32	fch_v_spool:1;
+			u32	fch_v_directory:1;
+			u32	fch_v_badblock:1;
+			u32	fch_v_markdel:1;
+			u32	fch_v_nocharge:1;
+			u32	fch_v_erase:1;
+		}		s1;
+		u32		fh2_l_filechar;
+	}			u4;
+	u16			fh2_w_res1;
+	u8			fh2_b_map_inuse;
+	u8			fh2_b_acc_mode;
 	union {
-		u32	     fh2_l_fileowner;
+		u32		fh2_l_fileowner;
 		struct {
-			u16  fh2_w_mem;
-			u16  fh2_w_grp;
-		} s1;
-	} u5;
-	u16		     fh2_w_fileprot;
+			u16	fh2_w_mem;
+			u16	fh2_w_grp;
+		}		s1;
+	}			u5;
+	u16			fh2_w_fileprot;
 	union {
-		u16	     fh2_w_backlink[3];
+		u16		fh2_w_backlink[3];
 		struct {
-			u16  fid_w_num;
-			u16  fid_w_seq;
-			u8   fid_b_rvn;
-			u8   fid_b_nmx;
-		} s1;
-	} u6;
-	u8		     fh2_b_journal;
-	u8		     fh2_b_ru_active;
-	u16		     fh2_w_res2;
-	u32		     fh2_l_highwater;
-	u8		     fh2_b_res3[8];
-	u8		     fh2_r_class_prot[20];
-	u8		     fh2_b_res4[402];
-	u16		     fh2_w_checksum;
+			u16	fid_w_num;
+			u16	fid_w_seq;
+			u8	fid_b_rvn;
+			u8	fid_b_nmx;
+		}		s1;
+	}			u6;
+	u8			fh2_b_journal;
+	u8			fh2_b_ru_active;
+	u16			fh2_w_res2;
+	u32			fh2_l_highwater;
+	u8			fh2_b_res3[8];
+	u8			fh2_r_class_prot[20];
+	u8			fh2_b_res4[402];
+	u16			fh2_w_checksum;
 };
 
 /*
@@ -240,57 +240,57 @@
  * It is part of the file header.
  * It defines RMS attributes for any file.
  */
-#define FAT_C_UNDEFINED	 0
-#define FAT_C_FIXED	 1
-#define FAT_C_VARIABLE	 2
-#define FAT_C_VFC	 3
-#define FAT_C_STREAM	 4
-#define FAT_C_STREAMLF	 5
-#define FAT_C_STREAMCR	 6
+#define FAT_C_UNDEFINED		0
+#define FAT_C_FIXED		1
+#define FAT_C_VARIABLE		2
+#define FAT_C_VFC		3
+#define FAT_C_STREAM		4
+#define FAT_C_STREAMLF		5
+#define FAT_C_STREAMCR		6
 
-#define FAT_C_SEQUANTIAL 0
-#define FAT_C_RELATIVE	 1
-#define FAT_C_INDEXED	 2
-#define FAT_C_DIRECT	 3
+#define FAT_C_SEQUANTIAL	0
+#define FAT_C_RELATIVE		1
+#define FAT_C_INDEXED		2
+#define FAT_C_DIRECT		3
 
-#define FAT_M_FORTRANCC	 0x01
-#define FAT_M_IMPLIEDCC	 0x02
-#define FAT_M_PRINTCC	 0x04
-#define FAT_M_NOSPAN	 0x08
-#define FAT_M_MSBRCW	 0x10
+#define FAT_M_FORTRANCC		0x01
+#define FAT_M_IMPLIEDCC		0x02
+#define FAT_M_PRINTCC		0x04
+#define FAT_M_NOSPAN		0x08
+#define FAT_M_MSBRCW		0x10
 
 struct fatdef {
 	union {
-		u8	     fat_b_rtype;
+		u8		fat_b_rtype;
 		struct {
-			u8   fat_v_rtype:4;
-			u8   fat_v_fileorg:4;
-		} s0;
-	} u0;
-	u8		     fat_b_rattrib;
-	u8		     fat_w_rsize;
+			u8	fat_v_rtype:4;
+			u8	fat_v_fileorg:4;
+		}		s0;
+	}			u0;
+	u8			fat_b_rattrib;
+	u8			fat_w_rsize;
 	union {
-		u32	     fat_l_hiblk;
+		u32		fat_l_hiblk;
 		struct {
-			u16  fat_w_hiblkh;
-			u16  fat_w_hiblkl;
-		} s1;
-	} u1;
+			u16	fat_w_hiblkh;
+			u16	fat_w_hiblkl;
+		}		s1;
+	}			u1;
 	union {
-		u32	     fat_l_efblk;
+		u32		fat_l_efblk;
 		struct {
-			u16  fat_w_efblkh;
-			u16  fat_w_efblkl;
-		} s1;
+			u16	fat_w_efblkh;
+			u16	fat_w_efblkl;
+		}		s1;
 	} u2;
-	u16		     fat_w_ffbyte;
-	u8		     fat_b_bktsize;
-	u8		     fat_b_vfcsize;
-	u16		     fat_w_maxrec;
-	u16		     fat_w_defext;
-	u8		     fat_b_res1[6];
-	u16		     fat_w_notused;
-	u16		     fat_w_versions;
+	u16			fat_w_ffbyte;
+	u8			fat_b_bktsize;
+	u8			fat_b_vfcsize;
+	u16			fat_w_maxrec;
+	u16			fat_w_defext;
+	u8			fat_b_res1[6];
+	u16			fat_w_notused;
+	u16			fat_w_versions;
 };
 
 /*
@@ -301,21 +301,21 @@
 struct fm2def {
 	union {
 		struct {
-			u8   fm2_b_count1;
-			u8   fm2_v_highlbn:6;
-			u8   fm2_v_format:2;
-			u16  fm2_w_lowlbn;
-		} fm1;
+			u8	fm2_b_count1;
+			u8	fm2_v_highlbn:6;
+			u8	fm2_v_format:2;
+			u16	fm2_w_lowlbn;
+		}		fm1;
 		struct {
-			u16  fm2_v_count2:14;
-			u16  fm2_v_format:2;
-			u16  fm2_l_lbn2[2];
-		} fm2;
+			u16	fm2_v_count2:14;
+			u16	fm2_v_format:2;
+			u16	fm2_l_lbn2[2];
+		}		fm2;
 		struct {
-			u16  fm2_v_count2:14;
-			u16  fm2_v_format:2;
-			u16  fm2_w_lowcount;
-			u32  fm2_l_lbn3;
+			u16	fm2_v_count2:14;
+			u16	fm2_v_format:2;
+			u16	fm2_w_lowcount;
+			u32	fm2_l_lbn3;
 		} fm3;
 	} u1;
 };
@@ -328,33 +328,33 @@
 struct dirdef {
 	union {
 		struct {
-			u16  dir_w_size;
-			s16  dir_w_verlimit;
+			u16			dir_w_size;
+			s16			dir_w_verlimit;
 			union {
-				u8	dir_b_flags;
+				u8		dir_b_flags;
 				struct {
-					u8 dir_v_type:3;
-					u8 dir_v_res1:3;
-					u8 dir_v_nextrec:1;
-					u8 dir_v_prevrec:1;
-				} s4;
-			} u4;
-			u8   dir_b_namecount;
-			char dir_t_name;
-		} s1;
+					u8	dir_v_type:3;
+					u8	dir_v_res1:3;
+					u8	dir_v_nextrec:1;
+					u8	dir_v_prevrec:1;
+				}		s4;
+			}			u4;
+			u8			dir_b_namecount;
+			char			dir_t_name;
+		}				s1;
 		struct {
-			u16	dir_w_version;
+			u16			dir_w_version;
 			union {
-				u16	dir_w_fid[3];
+				u16		dir_w_fid[3];
 				struct {
-					u16 fid_w_num;
-					u16 fid_w_seq;
-					u8  fid_b_rvn;
-					u8  fid_b_nmx;
-				} s3;
-			} u2;
-		} s2;
-	} u1;
+					u16	fid_w_num;
+					u16	fid_w_seq;
+					u8	fid_b_rvn;
+					u8	fid_b_nmx;
+				}		s3;
+			}			u2;
+		}				s2;
+	}					u1;
 };
 
 /*
@@ -362,11 +362,11 @@
  * and definitions.
  */
 struct ods2map {
-	struct ods2map		  *nxt;
+	struct ods2map	*nxt;
 	struct {
-		u32		  cnt;
-		u32		  lbn;
-	} s1[16];
+		u32	cnt;
+		u32	lbn;
+	}		s1[16];
 };
 
 /*
@@ -378,11 +378,11 @@
  * below has 128 pointers.
  */
 struct ods2var {
-	struct ods2var		 *nxt;	   /* next block if needed */
+	struct ods2var	*nxt;		/* next block if needed */
 	struct {
-		u64		  recoffs; /* offset to start of record */
-		loff_t		  loff;	   /* virtual offset to start of record */
-	} s1[16];
+		u64	recoffs;	/* offset to start of record */
+		loff_t	loff;		/* virtual offset to start of record */
+	}		s1[16];
 };
 
 /*
@@ -425,8 +425,8 @@
 			u32	v_raw:1;	/* this file handler must
 						   return data in raw mode */
 			u32	v_res1:31;
-		} s1;
-	} u1;
+		}		s1;
+	}			u1;
 };
 
 /*
@@ -471,8 +471,9 @@
  * 1024 or 2048 bytes.
  * I.e. the RRD47 CDROM drive on my Alpha server 1200 report a sector
  * size of 2048 even for an ODS2 CD.
+ *
+ * FIXME: These macros need deuglification.
  */
-
 #define GETBLKNO(a, b)		((b) >> (a->s_blocksize_bits - 9))
 #define GETBLKP(a, b, c)	((void *)&(((char *)(c))[((b) & ((a)->s_blocksize_bits == 9 ? 0 : ((a)->s_blocksize_bits == 10 ? 1 : 3))) << 9]))