[Ocfs2-tools-commits] manish commits r1012 - in branches/ocfs2-tools-1.0: . libocfs2/include mkfs.ocfs2

[svn-commits at oss.oracle.com]

Author: manish
Date: 2005-08-02 19:03:25 -0500 (Tue, 02 Aug 2005)
New Revision: 1012

Modified:
   branches/ocfs2-tools-1.0/Config.make.in
   branches/ocfs2-tools-1.0/configure.in
   branches/ocfs2-tools-1.0/libocfs2/include/ocfs2_fs.h
   branches/ocfs2-tools-1.0/mkfs.ocfs2/mkfs.c
Log:
Drop s390 support for 1.0.x, refuse to build on big endian systems


Modified: branches/ocfs2-tools-1.0/Config.make.in
===================================================================
--- branches/ocfs2-tools-1.0/Config.make.in	2005-08-02 23:58:01 UTC (rev 1011)
+++ branches/ocfs2-tools-1.0/Config.make.in	2005-08-03 00:03:25 UTC (rev 1012)
@@ -69,5 +69,3 @@
 
 OCFS2_DYNAMIC_FSCK = @OCFS2_DYNAMIC_FSCK@
 OCFS2_DYNAMIC_CTL = @OCFS2_DYNAMIC_CTL@
-
-B0RKEN_ENDIAN = @B0RKEN_ENDIAN@

Modified: branches/ocfs2-tools-1.0/configure.in
===================================================================
--- branches/ocfs2-tools-1.0/configure.in	2005-08-02 23:58:01 UTC (rev 1011)
+++ branches/ocfs2-tools-1.0/configure.in	2005-08-03 00:03:25 UTC (rev 1012)
@@ -91,16 +91,9 @@
   AC_MSG_ERROR([Unable to find uuid headers]))
 AC_SUBST(UUID_LIBS)
 
-AC_C_BIGENDIAN()
+AC_C_BIGENDIAN([AC_MSG_ERROR([Big endian platforms are not supported yet])],,
+  [AC_MSG_ERROR([Could not determine endianness of platform])])
 
-B0RKEN_ENDIAN=
-case "$host_cpu" in
-  s390x)
-    B0RKEN_ENDIAN=-DCONFIG_ARCH_S390=1
-    ;;
-esac
-AC_SUBST(B0RKEN_ENDIAN)
-
 AC_MSG_CHECKING(for debug executables)
 AC_ARG_ENABLE(debugexe, [  --enable-debugexe=[yes/no]     Enable debug executables for library source files [default=no]],,enable_debugexe=no)
 OCFS2_DEBUG_EXE=

Modified: branches/ocfs2-tools-1.0/libocfs2/include/ocfs2_fs.h
===================================================================
--- branches/ocfs2-tools-1.0/libocfs2/include/ocfs2_fs.h	2005-08-02 23:58:01 UTC (rev 1011)
+++ branches/ocfs2-tools-1.0/libocfs2/include/ocfs2_fs.h	2005-08-03 00:03:25 UTC (rev 1012)
@@ -10,12 +10,12 @@
  * 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,
@@ -86,20 +86,9 @@
 	OCFS2_SB(sb)->s_feature_incompat &= ~(mask)
 
 #define OCFS2_FEATURE_COMPAT_SUPP	0
+#define OCFS2_FEATURE_INCOMPAT_SUPP	0
 #define OCFS2_FEATURE_RO_COMPAT_SUPP	0
 
-/* We're not big endian safe yet. But it has been decreed that the
- * unwashed zLinux masses must be appeased, lest they storm the castle
- * with rakes and pitchforks. Thus...
- */
-#ifdef CONFIG_ARCH_S390
-#define OCFS2_FEATURE_INCOMPAT_B0RKEN_ENDIAN	0x0001
-
-#define OCFS2_FEATURE_INCOMPAT_SUPP	OCFS2_FEATURE_INCOMPAT_B0RKEN_ENDIAN
-#else
-#define OCFS2_FEATURE_INCOMPAT_SUPP	0
-#endif
-
 /*
  * Heartbeat-only devices are missing journals and other files.  The
  * filesystem driver can't load them, but the library can.  Never put
@@ -255,7 +244,7 @@
 	__u32 e_clusters;	/* Clusters covered by this extent */
 	__u64 e_blkno;		/* Physical disk offset, in blocks */
 /*10*/
-} ocfs2_extent_rec;	
+} ocfs2_extent_rec;
 
 typedef struct _ocfs2_chain_rec {
 	__u32 c_free;	/* Number of free bits in this chain. */

Modified: branches/ocfs2-tools-1.0/mkfs.ocfs2/mkfs.c
===================================================================
--- branches/ocfs2-tools-1.0/mkfs.ocfs2/mkfs.c	2005-08-02 23:58:01 UTC (rev 1011)
+++ branches/ocfs2-tools-1.0/mkfs.ocfs2/mkfs.c	2005-08-03 00:03:25 UTC (rev 1012)
@@ -1582,9 +1582,6 @@
 	di->id2.i_super.s_first_cluster_group = cpu_to_le64(s->first_cluster_group_blkno);
 
 	incompat = 0;
-#ifdef CONFIG_ARCH_S390
-	incompat |= OCFS2_FEATURE_INCOMPAT_B0RKEN_ENDIAN;
-#endif
 	if (s->hb_dev)
 		incompat |= OCFS2_FEATURE_INCOMPAT_HEARTBEAT_DEV;