[Ocfs2-commits] manish commits r2493 - branches/ocfs2-1.0/fs/ocfs2

[svn-commits at oss.oracle.com]

Author: manish
Signed-off-by: zab
Date: 2005-08-02 19:00:37 -0500 (Tue, 02 Aug 2005)
New Revision: 2493

Modified:
   branches/ocfs2-1.0/fs/ocfs2/ocfs2_fs.h
   branches/ocfs2-1.0/fs/ocfs2/super.c
Log:
Drop incompat stuff for s390, we're not supporting it for 1.0.x.

Signed-off-by: zab


Modified: branches/ocfs2-1.0/fs/ocfs2/ocfs2_fs.h
===================================================================
--- branches/ocfs2-1.0/fs/ocfs2/ocfs2_fs.h	2005-08-02 23:00:25 UTC (rev 2492)
+++ branches/ocfs2-1.0/fs/ocfs2/ocfs2_fs.h	2005-08-03 00:00:37 UTC (rev 2493)
@@ -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

Modified: branches/ocfs2-1.0/fs/ocfs2/super.c
===================================================================
--- branches/ocfs2-1.0/fs/ocfs2/super.c	2005-08-02 23:00:25 UTC (rev 2492)
+++ branches/ocfs2-1.0/fs/ocfs2/super.c	2005-08-03 00:00:37 UTC (rev 2493)
@@ -1187,14 +1187,6 @@
 	osb->s_feature_incompat =
 		le32_to_cpu(OCFS2_RAW_SB(di)->s_feature_incompat);
 
-#ifdef CONFIG_ARCH_S390
-	if (!OCFS2_HAS_INCOMPAT_FEATURE(osb->sb, OCFS2_FEATURE_INCOMPAT_B0RKEN_ENDIAN)) {
-		mlog(ML_ERROR, "couldn't mount because of endian mismatch\n");
-		status = -EINVAL;
-		goto bail;
-	}
-#endif
-
 	if ((i = OCFS2_HAS_INCOMPAT_FEATURE(osb->sb, ~OCFS2_FEATURE_INCOMPAT_SUPP))) {
 		mlog(ML_ERROR, "couldn't mount because of unsupported "
 		     "optional features (%x).\n", i);