[Ocfs2-commits] jlbec commits r2684 - branches/enotypedefs/fs/ocfs2

[svn-commits at oss.oracle.com]

Author: jlbec
Date: 2005-11-08 16:10:43 -0600 (Tue, 08 Nov 2005)
New Revision: 2684

Modified:
   branches/enotypedefs/fs/ocfs2/ocfs1_fs_compat.h
   branches/enotypedefs/fs/ocfs2/super.c
Log:

o Remove ocfs2_fs_compat.h typedefs.



Modified: branches/enotypedefs/fs/ocfs2/ocfs1_fs_compat.h
===================================================================
--- branches/enotypedefs/fs/ocfs2/ocfs1_fs_compat.h	2005-11-08 22:07:41 UTC (rev 2683)
+++ branches/enotypedefs/fs/ocfs2/ocfs1_fs_compat.h	2005-11-08 22:10:43 UTC (rev 2684)
@@ -41,7 +41,7 @@
 /*
  * OCFS1 superblock.  Lives at sector 0.
  */
-typedef struct _ocfs1_vol_disk_hdr
+struct ocfs1_vol_disk_hdr
 {
 /*00*/	__u32 minor_version;
 	__u32 major_version;
@@ -70,10 +70,10 @@
 	__u32 prot_bits;
 	__s32 excl_mount;
 /*1B0*/
-} ocfs1_vol_disk_hdr;
+};
 
 
-typedef struct _ocfs1_disk_lock
+struct ocfs1_disk_lock
 {
 /*00*/	__u32 curr_master;
 	__u8 file_lock;
@@ -87,14 +87,14 @@
 /*20*/	__u64 oin_node_map;
 	__u64 dlock_seq_num;
 /*30*/
-} ocfs1_disk_lock;
+};
 
 /*
  * OCFS1 volume label.  Lives at sector 1.
  */
-typedef struct _ocfs1_vol_label
+struct ocfs1_vol_label
 {
-/*00*/	ocfs1_disk_lock disk_lock;
+/*00*/	struct ocfs1_disk_lock disk_lock;
 /*30*/	__u8 label[OCFS1_MAX_VOL_LABEL_LEN];
 /*70*/	__u16 label_len;
 /*72*/	__u8 vol_id[OCFS1_MAX_VOL_ID_LENGTH];
@@ -102,7 +102,7 @@
 /*84*/	__u8 cluster_name[OCFS1_MAX_CLUSTER_NAME_LEN];
 /*A4*/	__u16 cluster_name_len;
 /*A6*/
-} ocfs1_vol_label;
+};
 
 
 #endif /* _OCFS1_FS_COMPAT_H */

Modified: branches/enotypedefs/fs/ocfs2/super.c
===================================================================
--- branches/enotypedefs/fs/ocfs2/super.c	2005-11-08 22:07:41 UTC (rev 2683)
+++ branches/enotypedefs/fs/ocfs2/super.c	2005-11-08 22:10:43 UTC (rev 2684)
@@ -446,7 +446,7 @@
 			  int *sector_size)
 {
 	int status = 0, tmpstat;
-	ocfs1_vol_disk_hdr *hdr;
+	struct ocfs1_vol_disk_hdr *hdr;
 	struct ocfs2_dinode *di;
 	int blksize;
 
@@ -471,7 +471,7 @@
 		mlog_errno(status);
 		goto bail;
 	}
-	hdr = (ocfs1_vol_disk_hdr *) (*bh)->b_data;
+	hdr = (struct ocfs1_vol_disk_hdr *) (*bh)->b_data;
 	if (hdr->major_version == OCFS1_MAJOR_VERSION) {
 		mlog(ML_ERROR, "incompatible version: %u.%u\n",
 		     hdr->major_version, hdr->minor_version);