[Ocfs2-tools-commits] jlbec commits r958 - in trunk: . debugfs.ocfs2 extras fsck.ocfs2 fswreck libo2cb libo2dlm libocfs2 libocfs2/include listuuid mkfs.ocfs2 mount.ocfs2 mounted.ocfs2 o2cb_ctl ocfs2_hb_ctl ocfs2cdsl ocfs2console/ocfs2interface sizetest tunefs.ocfs2

svn-commits at oss.oracle.com svn-commits at oss.oracle.com
Thu Jun 16 23:13:10 CDT 2005


Author: jlbec
Date: 2005-06-16 23:13:08 -0500 (Thu, 16 Jun 2005)
New Revision: 958

Added:
   trunk/libocfs2/include/ocfs2_lockid.h
Modified:
   trunk/Config.make.in
   trunk/configure.in
   trunk/debugfs.ocfs2/Makefile
   trunk/extras/Makefile
   trunk/extras/decode_lockres.c
   trunk/extras/encode_lockres.c
   trunk/fsck.ocfs2/Makefile
   trunk/fswreck/Makefile
   trunk/libo2cb/Makefile
   trunk/libo2dlm/Makefile
   trunk/libocfs2/Makefile
   trunk/libocfs2/dlm.c
   trunk/listuuid/Makefile
   trunk/mkfs.ocfs2/Makefile
   trunk/mount.ocfs2/Makefile
   trunk/mounted.ocfs2/Makefile
   trunk/o2cb_ctl/Makefile
   trunk/ocfs2_hb_ctl/Makefile
   trunk/ocfs2cdsl/Makefile
   trunk/ocfs2console/ocfs2interface/Makefile
   trunk/sizetest/Makefile
   trunk/tunefs.ocfs2/Makefile
Log:

o Rename the OCFS_TYPE bits.
o Rename OCFS_DEBUG to OCFS2_DEBUG.
o Bring in ocfs2_lockid.h from the kernel.



Modified: trunk/Config.make.in
===================================================================
--- trunk/Config.make.in	2005-06-17 03:27:33 UTC (rev 957)
+++ trunk/Config.make.in	2005-06-17 04:13:08 UTC (rev 958)
@@ -63,7 +63,7 @@
 BUILD_OCFS2CDSL = @BUILD_OCFS2CDSL@
 BUILD_DEBUGOCFS2 = @BUILD_DEBUGOCFS2@
 
-OCFS_DEBUG = @OCFS_DEBUG@
+OCFS2_DEBUG = @OCFS2_DEBUG@
 
 OCFS2_DEBUG_EXE = @OCFS2_DEBUG_EXE@
 

Modified: trunk/configure.in
===================================================================
--- trunk/configure.in	2005-06-17 03:27:33 UTC (rev 957)
+++ trunk/configure.in	2005-06-17 04:13:08 UTC (rev 958)
@@ -66,11 +66,11 @@
 
 AC_MSG_CHECKING(for debugging)
 AC_ARG_ENABLE(debug, [  --enable-debug=[yes/no]         Turn on debugging [default=yes]],,enable_debug=yes)
-OCFS_DEBUG=
+OCFS2_DEBUG=
 if test "x$enable_debug" = "xyes"; then
-  OCFS_DEBUG=yes
+  OCFS2_DEBUG=yes
 fi
-AC_SUBST(OCFS_DEBUG)
+AC_SUBST(OCFS2_DEBUG)
 AC_MSG_RESULT($enable_debug)
 
 COM_ERR_LIBS=

Modified: trunk/debugfs.ocfs2/Makefile
===================================================================
--- trunk/debugfs.ocfs2/Makefile	2005-06-17 03:27:33 UTC (rev 957)
+++ trunk/debugfs.ocfs2/Makefile	2005-06-17 04:13:08 UTC (rev 958)
@@ -11,7 +11,7 @@
 INCLUDES = -Iinclude -I$(TOPDIR)/libocfs2/include -I$(TOPDIR)/libo2dlm/include -I$(TOPDIR)/libo2cb/include
 INCLUDES += $(GLIB_CFLAGS)
 
-ifdef OCFS_DEBUG
+ifdef OCFS2_DEBUG
 CFLAGS = -Wall -O -ggdb
 else
 CFLAGS = -Wall -O2

Modified: trunk/extras/Makefile
===================================================================
--- trunk/extras/Makefile	2005-06-17 03:27:33 UTC (rev 957)
+++ trunk/extras/Makefile	2005-06-17 04:13:08 UTC (rev 958)
@@ -5,7 +5,7 @@
 WARNINGS = -Wall -Wstrict-prototypes -Wmissing-prototypes \
            -Wmissing-declarations
 
-ifdef OCFS_DEBUG
+ifdef OCFS2_DEBUG
 OPTS = -g
 endif
 

Modified: trunk/extras/decode_lockres.c
===================================================================
--- trunk/extras/decode_lockres.c	2005-06-17 03:27:33 UTC (rev 957)
+++ trunk/extras/decode_lockres.c	2005-06-17 04:13:08 UTC (rev 958)
@@ -33,10 +33,10 @@
 
 /* Begin paste from kernel module */
 enum ocfs2_lock_type {
-	OCFS_TYPE_META = 0,
-	OCFS_TYPE_DATA,
-	OCFS_TYPE_SUPER,
-	OCFS_NUM_LOCK_TYPES
+	OCFS2_TYPE_META = 0,
+	OCFS2_TYPE_DATA,
+	OCFS2_TYPE_SUPER,
+	OCFS2_NUM_LOCK_TYPES
 };
 
 /* lock ids are made up in the following manner:
@@ -48,17 +48,17 @@
 #define OCFS2_LOCK_ID_MAX_LEN  32
 #define OCFS2_LOCK_ID_PAD "000000"
 
-static char ocfs2_lock_type_char[OCFS_NUM_LOCK_TYPES] = {
-	[OCFS_TYPE_META]  = 'M',
-	[OCFS_TYPE_DATA]  = 'D',
-	[OCFS_TYPE_SUPER] = 'S'
+static char ocfs2_lock_type_char[OCFS2_NUM_LOCK_TYPES] = {
+	[OCFS2_TYPE_META]  = 'M',
+	[OCFS2_TYPE_DATA]  = 'D',
+	[OCFS2_TYPE_SUPER] = 'S'
 };
 /* End paste from kernel module */
 
-static char * ocfs2_lock_type_string[OCFS_NUM_LOCK_TYPES] = {
-	[OCFS_TYPE_META]  = "Metadata",
-	[OCFS_TYPE_DATA]  = "Data",
-	[OCFS_TYPE_SUPER] = "Superblock"
+static char * ocfs2_lock_type_string[OCFS2_NUM_LOCK_TYPES] = {
+	[OCFS2_TYPE_META]  = "Metadata",
+	[OCFS2_TYPE_DATA]  = "Data",
+	[OCFS2_TYPE_SUPER] = "Superblock"
 };
 
 static void usage(char *program)
@@ -71,12 +71,12 @@
 {
 	enum ocfs2_lock_type t;
 
-	if (c == ocfs2_lock_type_char[OCFS_TYPE_META])
-		t = OCFS_TYPE_META;
-	else if (c == ocfs2_lock_type_char[OCFS_TYPE_DATA])
-		t = OCFS_TYPE_DATA;
-	else if (c == ocfs2_lock_type_char[OCFS_TYPE_SUPER])
-		t = OCFS_TYPE_SUPER;
+	if (c == ocfs2_lock_type_char[OCFS2_TYPE_META])
+		t = OCFS2_TYPE_META;
+	else if (c == ocfs2_lock_type_char[OCFS2_TYPE_DATA])
+		t = OCFS2_TYPE_DATA;
+	else if (c == ocfs2_lock_type_char[OCFS2_TYPE_SUPER])
+		t = OCFS2_TYPE_SUPER;
 	else
 		return NULL;
 

Modified: trunk/extras/encode_lockres.c
===================================================================
--- trunk/extras/encode_lockres.c	2005-06-17 03:27:33 UTC (rev 957)
+++ trunk/extras/encode_lockres.c	2005-06-17 04:13:08 UTC (rev 958)
@@ -34,10 +34,10 @@
 
 /* Begin paste from kernel module */
 enum ocfs2_lock_type {
-	OCFS_TYPE_META = 0,
-	OCFS_TYPE_DATA,
-	OCFS_TYPE_SUPER,
-	OCFS_NUM_LOCK_TYPES
+	OCFS2_TYPE_META = 0,
+	OCFS2_TYPE_DATA,
+	OCFS2_TYPE_SUPER,
+	OCFS2_NUM_LOCK_TYPES
 };
 
 /* lock ids are made up in the following manner:
@@ -49,10 +49,10 @@
 #define OCFS2_LOCK_ID_MAX_LEN  32
 #define OCFS2_LOCK_ID_PAD "000000"
 
-static char ocfs2_lock_type_char[OCFS_NUM_LOCK_TYPES] = {
-	[OCFS_TYPE_META]	'M',
-	[OCFS_TYPE_DATA] 	'D',
-	[OCFS_TYPE_SUPER]       'S'
+static char ocfs2_lock_type_char[OCFS2_NUM_LOCK_TYPES] = {
+	[OCFS2_TYPE_META]	'M',
+	[OCFS2_TYPE_DATA] 	'D',
+	[OCFS2_TYPE_SUPER]       'S'
 };
 /* End paste from kernel module */
 
@@ -80,11 +80,11 @@
 	tmp = atoll(argv[3]);
 	generation = (uint32_t) tmp;
 
-	for (i = 0; i < OCFS_NUM_LOCK_TYPES; i++)
+	for (i = 0; i < OCFS2_NUM_LOCK_TYPES; i++)
 		if (type == ocfs2_lock_type_char[i])
 			break;
 
-	if (i == OCFS_NUM_LOCK_TYPES) {
+	if (i == OCFS2_NUM_LOCK_TYPES) {
 		fprintf(stderr, "Invalid lock type '%c'\n", type);
 		return 1;
 	}

Modified: trunk/fsck.ocfs2/Makefile
===================================================================
--- trunk/fsck.ocfs2/Makefile	2005-06-17 03:27:33 UTC (rev 957)
+++ trunk/fsck.ocfs2/Makefile	2005-06-17 04:13:08 UTC (rev 958)
@@ -15,7 +15,7 @@
 LIBO2CB_LIBS = -L$(TOPDIR)/libo2cb -lo2cb
 LIBO2CB_DEPS = $(TOPDIR)/libo2cb/libo2cb.a
 
-ifdef OCFS_DEBUG
+ifdef OCFS2_DEBUG
 OPTS += -ggdb
 else
 OPTS += -O2

Modified: trunk/fswreck/Makefile
===================================================================
--- trunk/fswreck/Makefile	2005-06-17 03:27:33 UTC (rev 957)
+++ trunk/fswreck/Makefile	2005-06-17 04:13:08 UTC (rev 958)
@@ -10,7 +10,7 @@
 INCLUDES = -Iinclude -I$(TOPDIR)/libocfs2/include -I$(TOPDIR)/libo2dlm/include -I$(TOPDIR)/libo2cb/include
 INCLUDES += $(GLIB_CFLAGS)
 
-ifdef OCFS_DEBUG
+ifdef OCFS2_DEBUG
 CFLAGS = -Wall -O -ggdb
 else
 CFLAGS = -Wall -O2

Modified: trunk/libo2cb/Makefile
===================================================================
--- trunk/libo2cb/Makefile	2005-06-17 03:27:33 UTC (rev 957)
+++ trunk/libo2cb/Makefile	2005-06-17 04:13:08 UTC (rev 958)
@@ -5,7 +5,7 @@
 WARNINGS = -Wall -Wstrict-prototypes -Wmissing-prototypes \
 	-Wmissing-declarations
 
-ifdef OCFS_DEBUG
+ifdef OCFS2_DEBUG
 OPTS += -ggdb
 else
 OPTS += -O2

Modified: trunk/libo2dlm/Makefile
===================================================================
--- trunk/libo2dlm/Makefile	2005-06-17 03:27:33 UTC (rev 957)
+++ trunk/libo2dlm/Makefile	2005-06-17 04:13:08 UTC (rev 958)
@@ -5,7 +5,7 @@
 WARNINGS = -Wall -Wstrict-prototypes -Wmissing-prototypes \
 	-Wmissing-declarations
 
-ifdef OCFS_DEBUG
+ifdef OCFS2_DEBUG
 OPTS += -ggdb
 else
 OPTS += -O2

Modified: trunk/libocfs2/Makefile
===================================================================
--- trunk/libocfs2/Makefile	2005-06-17 03:27:33 UTC (rev 957)
+++ trunk/libocfs2/Makefile	2005-06-17 04:13:08 UTC (rev 958)
@@ -5,7 +5,7 @@
 WARNINGS = -Wall -Wstrict-prototypes -Wmissing-prototypes \
 	-Wmissing-declarations
 
-ifdef OCFS_DEBUG
+ifdef OCFS2_DEBUG
 OPTS += -ggdb
 else
 OPTS += -O2
@@ -94,6 +94,7 @@
 	include/kernel-list.h		\
 	include/kernel-rbtree.h		\
 	include/ocfs1_fs_compat.h	\
+	include/ocfs2_lockid.h		\
 	include/ocfs2_fs.h		\
 	include/ocfs2.h
 

Modified: trunk/libocfs2/dlm.c
===================================================================
--- trunk/libocfs2/dlm.c	2005-06-17 03:27:33 UTC (rev 957)
+++ trunk/libocfs2/dlm.c	2005-06-17 04:13:08 UTC (rev 958)
@@ -29,32 +29,18 @@
 #define __USE_MISC
 #include <string.h>
 #include <inttypes.h>
-                                                                                                                                                         
+
 #include "ocfs2.h"
+#include "ocfs2_lockid.h"
 
 #define DEFAULT_DLMFS_PATH	"/dlm/"
-#define OCFS2_LOCK_ID_MAX_LEN	32
-#define OCFS2_LOCK_ID_PAD	"000000"
 
-enum ocfs2_lock_type {
-	OCFS_TYPE_META = 0,
-	OCFS_TYPE_DATA,
-	OCFS_TYPE_SUPER,
-	OCFS_NUM_LOCK_TYPES
-};
-
-static char ocfs2_lock_type_char[OCFS_NUM_LOCK_TYPES] = {
-	[OCFS_TYPE_META]  = 'M',
-	[OCFS_TYPE_DATA]  = 'D',
-	[OCFS_TYPE_SUPER] = 'S'
-};
-
 static void ocfs2_build_lock_name(ocfs2_filesys *fs, enum ocfs2_lock_type type,
 				  uint64_t blkno, uint32_t generation,
 				  char *lock_name)
 {
 	snprintf(lock_name, OCFS2_LOCK_ID_MAX_LEN, "%c%s%016"PRIx64"%08x",
-		 ocfs2_lock_type_char[type], OCFS2_LOCK_ID_PAD,
+		 ocfs2_lock_type_char(type), OCFS2_LOCK_ID_PAD,
 		 blkno, generation);
 
 	return ;
@@ -174,7 +160,7 @@
 	char lock_name[OCFS2_LOCK_ID_MAX_LEN];
 	errcode_t ret;
 
-	ocfs2_build_lock_name(fs, OCFS_TYPE_SUPER, OCFS2_SUPER_BLOCK_BLKNO,
+	ocfs2_build_lock_name(fs, OCFS2_LOCK_TYPE_SUPER, OCFS2_SUPER_BLOCK_BLKNO,
 			      0, lock_name);
 
 	ret = o2dlm_lock(fs->fs_dlm_ctxt, lock_name,
@@ -188,7 +174,7 @@
 	char lock_name[OCFS2_LOCK_ID_MAX_LEN];
 	errcode_t ret;
 
-	ocfs2_build_lock_name(fs, OCFS_TYPE_SUPER, OCFS2_SUPER_BLOCK_BLKNO,
+	ocfs2_build_lock_name(fs, OCFS2_LOCK_TYPE_SUPER, OCFS2_SUPER_BLOCK_BLKNO,
 			      0, lock_name);
 
 	ret = o2dlm_unlock(fs->fs_dlm_ctxt, lock_name);
@@ -204,7 +190,7 @@
 	char lock_name[OCFS2_LOCK_ID_MAX_LEN];
 	errcode_t ret;
 
-	ocfs2_build_lock_name(fs, OCFS_TYPE_META, ci->ci_blkno,
+	ocfs2_build_lock_name(fs, OCFS2_LOCK_TYPE_META, ci->ci_blkno,
 			      ci->ci_inode->i_generation, lock_name);
 
 	ret = o2dlm_lock(fs->fs_dlm_ctxt, lock_name, flags, level);
@@ -218,7 +204,7 @@
 	char lock_name[OCFS2_LOCK_ID_MAX_LEN];
 	errcode_t ret;
 
-	ocfs2_build_lock_name(fs, OCFS_TYPE_META, ci->ci_blkno,
+	ocfs2_build_lock_name(fs, OCFS2_LOCK_TYPE_META, ci->ci_blkno,
 			      ci->ci_inode->i_generation, lock_name);
 
 	ret = o2dlm_unlock(fs->fs_dlm_ctxt, lock_name);

Added: trunk/libocfs2/include/ocfs2_lockid.h
===================================================================
--- trunk/libocfs2/include/ocfs2_lockid.h	2005-06-17 03:27:33 UTC (rev 957)
+++ trunk/libocfs2/include/ocfs2_lockid.h	2005-06-17 04:13:08 UTC (rev 958)
@@ -0,0 +1,69 @@
+/* -*- mode: c; c-basic-offset: 8; -*-
+ * vim: noexpandtab sw=8 ts=8 sts=0:
+ *
+ * ocfs2_lockid.h
+ *
+ * Defines OCFS2 lockid bits.
+ *
+ * Copyright (C) 2002, 2005 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 as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ * 
+ * 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.
+ */
+
+#ifndef OCFS2_LOCKID_H
+#define OCFS2_LOCKID_H
+
+/* lock ids are made up in the following manner:
+ * name[0]     --> type
+ * name[1-6]   --> 6 pad characters, reserved for now
+ * name[7-22]  --> block number, expressed in hex as 16 chars
+ * name[23-30] --> i_generation, expressed in hex 8 chars
+ * name[31]    --> '\0' */
+#define OCFS2_LOCK_ID_MAX_LEN  32
+#define OCFS2_LOCK_ID_PAD "000000"
+
+enum ocfs2_lock_type {
+	OCFS2_LOCK_TYPE_META = 0,
+	OCFS2_LOCK_TYPE_DATA,
+	OCFS2_LOCK_TYPE_SUPER,
+	OCFS2_LOCK_TYPE_RENAME,
+	OCFS2_NUM_LOCK_TYPES
+};
+
+static inline char ocfs2_lock_type_char(enum ocfs2_lock_type type)
+{
+	char c;
+	switch (type) {
+		case OCFS2_LOCK_TYPE_META:
+			c = 'M';
+			break;
+		case OCFS2_LOCK_TYPE_DATA:
+			c = 'D';
+			break;
+		case OCFS2_LOCK_TYPE_SUPER:
+			c = 'S';
+			break;
+		case OCFS2_LOCK_TYPE_RENAME:
+			c = 'R';
+
+		default:
+			c = '\0';
+	}
+	
+	return c;
+}
+
+#endif  /* OCFS2_LOCKID_H */

Modified: trunk/listuuid/Makefile
===================================================================
--- trunk/listuuid/Makefile	2005-06-17 03:27:33 UTC (rev 957)
+++ trunk/listuuid/Makefile	2005-06-17 04:13:08 UTC (rev 958)
@@ -16,7 +16,7 @@
 LIBO2CB_LIBS = -L$(TOPDIR)/libo2cb -lo2cb
 LIBO2CB_DEPS = $(TOPDIR)/libo2cb/libo2cb.a
 
-ifdef OCFS_DEBUG
+ifdef OCFS2_DEBUG
 OPTS += -ggdb
 else
 OPTS += -O2

Modified: trunk/mkfs.ocfs2/Makefile
===================================================================
--- trunk/mkfs.ocfs2/Makefile	2005-06-17 03:27:33 UTC (rev 957)
+++ trunk/mkfs.ocfs2/Makefile	2005-06-17 04:13:08 UTC (rev 958)
@@ -5,7 +5,7 @@
 WARNINGS = -Wall -Wstrict-prototypes -Wmissing-prototypes \
            -Wmissing-declarations
 
-ifdef OCFS_DEBUG
+ifdef OCFS2_DEBUG
 OPTS = -ggdb -O0
 else
 OPTS = -O2

Modified: trunk/mount.ocfs2/Makefile
===================================================================
--- trunk/mount.ocfs2/Makefile	2005-06-17 03:27:33 UTC (rev 957)
+++ trunk/mount.ocfs2/Makefile	2005-06-17 04:13:08 UTC (rev 958)
@@ -14,7 +14,7 @@
 LIBO2CB_LIBS = -L$(TOPDIR)/libo2cb -lo2cb
 LIBO2CB_DEPS = $(TOPDIR)/libo2cb/libo2cb.a
 
-ifdef OCFS_DEBUG
+ifdef OCFS2_DEBUG
 OPTS += -ggdb
 else
 OPTS += -O2

Modified: trunk/mounted.ocfs2/Makefile
===================================================================
--- trunk/mounted.ocfs2/Makefile	2005-06-17 03:27:33 UTC (rev 957)
+++ trunk/mounted.ocfs2/Makefile	2005-06-17 04:13:08 UTC (rev 958)
@@ -5,7 +5,7 @@
 WARNINGS = -Wall -Wstrict-prototypes -Wmissing-prototypes \
            -Wmissing-declarations
 
-ifdef OCFS_DEBUG
+ifdef OCFS2_DEBUG
 OPTS = -O -ggdb
 else
 OPTS = -O2

Modified: trunk/o2cb_ctl/Makefile
===================================================================
--- trunk/o2cb_ctl/Makefile	2005-06-17 03:27:33 UTC (rev 957)
+++ trunk/o2cb_ctl/Makefile	2005-06-17 04:13:08 UTC (rev 958)
@@ -13,7 +13,7 @@
 LIBO2CB_LIBS  = -L$(TOPDIR)/libo2cb -lo2cb
 LIBO2CB_DEPS = $(TOPDIR)/libo2cb/libo2cb.a
 
-ifdef OCFS_DEBUG
+ifdef OCFS2_DEBUG
 OPTS += -ggdb
 else
 OPTS += -O2

Modified: trunk/ocfs2_hb_ctl/Makefile
===================================================================
--- trunk/ocfs2_hb_ctl/Makefile	2005-06-17 03:27:33 UTC (rev 957)
+++ trunk/ocfs2_hb_ctl/Makefile	2005-06-17 04:13:08 UTC (rev 958)
@@ -14,7 +14,7 @@
 LIBO2CB_LIBS = -L$(TOPDIR)/libo2cb -lo2cb
 LIBO2CB_DEPS = $(TOPDIR)/libo2cb/libo2cb.a
 
-ifdef OCFS_DEBUG
+ifdef OCFS2_DEBUG
 OPTS += -ggdb
 else
 OPTS += -O2

Modified: trunk/ocfs2cdsl/Makefile
===================================================================
--- trunk/ocfs2cdsl/Makefile	2005-06-17 03:27:33 UTC (rev 957)
+++ trunk/ocfs2cdsl/Makefile	2005-06-17 04:13:08 UTC (rev 958)
@@ -4,7 +4,7 @@
 
 WARNINGS = -Wall
 
-ifdef OCFS_DEBUG
+ifdef OCFS2_DEBUG
 OPTS = -g
 endif
 

Modified: trunk/ocfs2console/ocfs2interface/Makefile
===================================================================
--- trunk/ocfs2console/ocfs2interface/Makefile	2005-06-17 03:27:33 UTC (rev 957)
+++ trunk/ocfs2console/ocfs2interface/Makefile	2005-06-17 04:13:08 UTC (rev 958)
@@ -4,7 +4,7 @@
 
 WARNINGS = -Wall
 
-ifdef OCFS_DEBUG
+ifdef OCFS2_DEBUG
 OPTS = -g
 endif
 OPTS = -g

Modified: trunk/sizetest/Makefile
===================================================================
--- trunk/sizetest/Makefile	2005-06-17 03:27:33 UTC (rev 957)
+++ trunk/sizetest/Makefile	2005-06-17 04:13:08 UTC (rev 958)
@@ -5,7 +5,7 @@
 #WARNINGS = -Wall -Wstrict-prototypes -Wmissing-prototypes \
 #           -Wmissing-declarations
 
-ifdef OCFS_DEBUG
+ifdef OCFS2_DEBUG
 OPTS = -O -ggdb
 else
 OPTS = -O2

Modified: trunk/tunefs.ocfs2/Makefile
===================================================================
--- trunk/tunefs.ocfs2/Makefile	2005-06-17 03:27:33 UTC (rev 957)
+++ trunk/tunefs.ocfs2/Makefile	2005-06-17 04:13:08 UTC (rev 958)
@@ -5,7 +5,7 @@
 WARNINGS = -Wall -Wstrict-prototypes -Wno-format -Wmissing-prototypes \
            -Wmissing-declarations
 
-ifdef OCFS_DEBUG
+ifdef OCFS2_DEBUG
 OPTS = -O -ggdb
 else
 OPTS = -O2



More information about the Ocfs2-tools-commits mailing list