[Ocfs2-commits] jlbec commits r1072 - branches/format-changes/src

[svn-commits at oss.oracle.com]

Author: jlbec
Date: 2004-06-12 19:58:39 -0500 (Sat, 12 Jun 2004)
New Revision: 1072

Added:
   branches/format-changes/src/ocfs1_fs_compat.h
Removed:
   branches/format-changes/src/ocfs1.h
Modified:
   branches/format-changes/src/Makefile
   branches/format-changes/src/super.c
Log:

o Moved ocfs1.h to ocfs1_fs_compat.h (matches ocfs2_fs.h naming).
o Fixed super.c to refer to it.
o Added it to HFILES in src/Makefile.



Modified: branches/format-changes/src/Makefile
===================================================================
--- branches/format-changes/src/Makefile	2004-06-13 00:57:16 UTC (rev 1071)
+++ branches/format-changes/src/Makefile	2004-06-13 00:58:39 UTC (rev 1072)
@@ -145,8 +145,9 @@
 	volcfg.c		\
 	vote.c
 
-HFILES = \
+HFILES =			\
 	ocfs2_fs.h		\
+	ocfs2_fs_compat.h	\
 	ocfs.h			\
 	ocfs_log.h		\
 	ocfs_compat.h		\

Deleted: branches/format-changes/src/ocfs1.h
===================================================================
--- branches/format-changes/src/ocfs1.h	2004-06-13 00:57:16 UTC (rev 1071)
+++ branches/format-changes/src/ocfs1.h	2004-06-13 00:58:39 UTC (rev 1072)
@@ -1,110 +0,0 @@
-/*
- * ocfs1_fs_compat.h
- *
- * OCFS1 volume header definitions.  OCFS2 creates valid but unmountable
- * OCFS1 volume headers on the first two sectors of an OCFS2 volume.
- * This allows an OCFS1 volume to see the partition and cleanly fail to
- * mount it.
- *
- * Copyright (C) 2002, 2004 Oracle.  All rights reserved.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public
- * License, version 2,  as published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 021110-1307, USA.
- *
- * Authors: Kurt Hackel, Mark Fasheh, Sunil Mushran, Wim Coekaerts,
- *	    Manish Singh, Neeraj Goyal, Suchit Kaura, Joel Becker
- */
-
-#ifndef _OCFS1_FS_COMPAT_H
-#define _OCFS1_FS_COMPAT_H
-
-#define MAX_VOL_SIGNATURE_LEN_V1          128
-#define MAX_MOUNT_POINT_LEN_V1            128
-#define MAX_VOL_ID_LENGTH_V1               16
-#define MAX_VOL_LABEL_LEN_V1               64
-#define MAX_CLUSTER_NAME_LEN_V1            64
-
-#define OCFS1_MAJOR_VERSION              (2)
-#define OCFS1_MINOR_VERSION              (0)
-#define OCFS1_VOLUME_SIGNATURE		 "OracleCFS"
-
-/*
- * OCFS1 superblock.  Lives at sector 0.
- */
-typedef struct _ocfs_vol_disk_hdr_v1
-{
-/*00*/	__u32 minor_version;
-	__u32 major_version;
-/*08*/	__u8 signature[MAX_VOL_SIGNATURE_LEN_V1];
-/*88*/	__u8 mount_point[MAX_MOUNT_POINT_LEN_V1];
-/*108*/	__u64 serial_num;
-/*110*/	__u64 device_size;
-	__u64 start_off;
-/*120*/	__u64 bitmap_off;
-	__u64 publ_off;
-/*130*/	__u64 vote_off;
-	__u64 root_bitmap_off;
-/*140*/	__u64 data_start_off;
-	__u64 root_bitmap_size;
-/*150*/	__u64 root_off;
-	__u64 root_size;
-/*160*/	__u64 cluster_size;
-	__u64 num_nodes;
-/*170*/	__u64 num_clusters;
-	__u64 dir_node_size;
-/*180*/	__u64 file_node_size;
-	__u64 internal_off;
-/*190*/	__u64 node_cfg_off;
-	__u64 node_cfg_size;
-/*1A0*/	__u64 new_cfg_off;
-	__u32 prot_bits;
-	__s32 excl_mount;
-/*1B0*/
-} ocfs_vol_disk_hdr_v1;
-
-
-typedef struct _ocfs_disk_lock_v1
-{
-/*00*/	__u32 curr_master;
-	__u8 file_lock;
-	__u8 compat_pad[3];  /* Not in orignal definition.  Used to
-				make the already existing alignment
-				explicit */
-	__u64 last_write_time;
-/*10*/	__u64 last_read_time;
-	__u32 writer_node_num;
-	__u32 reader_node_num;
-/*20*/	__u64 oin_node_map;
-	__u64 dlock_seq_num;
-/*30*/
-} ocfs_disk_lock_v1;
-
-/*
- * OCFS1 volume label.  Lives at sector 1.
- */
-typedef struct _ocfs_vol_label_v1
-{
-/*00*/	ocfs_disk_lock_v1 disk_lock;
-/*30*/	__u8 label[MAX_VOL_LABEL_LEN_V1];
-/*70*/	__u16 label_len;
-/*72*/	__u8 vol_id[MAX_VOL_ID_LENGTH_V1];
-/*82*/	__u16 vol_id_len;
-/*84*/	__u8 cluster_name[MAX_CLUSTER_NAME_LEN_V1];
-/*A4*/	__u16 cluster_name_len;
-/*A6*/
-} ocfs_vol_label_v1;
-
-
-#endif /* _OCFS1_FS_COMPAT_H */
-

Copied: branches/format-changes/src/ocfs1_fs_compat.h (from rev 1071, branches/format-changes/src/ocfs1.h)

Modified: branches/format-changes/src/super.c
===================================================================
--- branches/format-changes/src/super.c	2004-06-13 00:57:16 UTC (rev 1071)
+++ branches/format-changes/src/super.c	2004-06-13 00:58:39 UTC (rev 1072)
@@ -44,7 +44,7 @@
 #include "ocfs.h"
 
 /* this should be the only file to include a version 1 header */
-#include "ocfs1.h"
+#include "ocfs1_fs_compat.h"
 
 #include "alloc.h"
 #include "bitmap.h"