[Ocfs2-tools-commits] manish commits r1015 - in trunk: . libocfs2
libocfs2/include mkfs.ocfs2
svn-commits at oss.oracle.com
svn-commits at oss.oracle.com
Tue Aug 2 19:18:12 CDT 2005
Author: manish
Date: 2005-08-02 19:18:11 -0500 (Tue, 02 Aug 2005)
New Revision: 1015
Modified:
trunk/Config.make.in
trunk/configure.in
trunk/libocfs2/Makefile
trunk/libocfs2/include/ocfs2_fs.h
trunk/mkfs.ocfs2/Makefile
trunk/mkfs.ocfs2/mkfs.c
Log:
Remove endian special handling
Modified: trunk/Config.make.in
===================================================================
--- trunk/Config.make.in 2005-08-03 00:08:01 UTC (rev 1014)
+++ trunk/Config.make.in 2005-08-03 00:18:11 UTC (rev 1015)
@@ -69,5 +69,3 @@
OCFS2_DYNAMIC_FSCK = @OCFS2_DYNAMIC_FSCK@
OCFS2_DYNAMIC_CTL = @OCFS2_DYNAMIC_CTL@
-
-B0RKEN_ENDIAN = @B0RKEN_ENDIAN@
Modified: trunk/configure.in
===================================================================
--- trunk/configure.in 2005-08-03 00:08:01 UTC (rev 1014)
+++ trunk/configure.in 2005-08-03 00:18:11 UTC (rev 1015)
@@ -91,16 +91,6 @@
AC_MSG_ERROR([Unable to find uuid headers]))
AC_SUBST(UUID_LIBS)
-AC_C_BIGENDIAN()
-
-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: trunk/libocfs2/Makefile
===================================================================
--- trunk/libocfs2/Makefile 2005-08-03 00:08:01 UTC (rev 1014)
+++ trunk/libocfs2/Makefile 2005-08-03 00:18:11 UTC (rev 1015)
@@ -23,7 +23,6 @@
CFLAGS = $(OPTS) $(WARNINGS) -fPIC
CPPFLAGS += -DOCFS2_FLAT_INCLUDES -DO2DLM_FLAT_INCLUDES -DO2CB_FLAT_INCLUDES
-CPPFLAGS += $(B0RKEN_ENDIAN)
ifneq ($(OCFS2_DEBUG_EXE),)
DEBUG_EXE_FILES = $(shell awk '/DEBUG_EXE/{if (k[FILENAME] == 0) {print FILENAME; k[FILENAME] = 1;}}' $(CFILES))
Modified: trunk/libocfs2/include/ocfs2_fs.h
===================================================================
--- trunk/libocfs2/include/ocfs2_fs.h 2005-08-03 00:08:01 UTC (rev 1014)
+++ trunk/libocfs2/include/ocfs2_fs.h 2005-08-03 00:18:11 UTC (rev 1015)
@@ -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: trunk/mkfs.ocfs2/Makefile
===================================================================
--- trunk/mkfs.ocfs2/Makefile 2005-08-03 00:08:01 UTC (rev 1014)
+++ trunk/mkfs.ocfs2/Makefile 2005-08-03 00:18:11 UTC (rev 1015)
@@ -12,7 +12,6 @@
endif
CFLAGS = $(OPTS) $(WARNINGS)
-CPPFLAGS += $(B0RKEN_ENDIAN)
sbindir = $(root_sbindir)
SBIN_PROGRAMS = mkfs.ocfs2
Modified: trunk/mkfs.ocfs2/mkfs.c
===================================================================
--- trunk/mkfs.ocfs2/mkfs.c 2005-08-03 00:08:01 UTC (rev 1014)
+++ trunk/mkfs.ocfs2/mkfs.c 2005-08-03 00:18:11 UTC (rev 1015)
@@ -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;
More information about the Ocfs2-tools-commits
mailing list