[Ocfs2-tools-devel] [PATCH 3/4] includes: Move public o2cb headers
to the new location.
Joel Becker
joel.becker at oracle.com
Mon Jan 7 17:19:33 PST 2008
The public headers for libo2cb now live at $(TOPDIR)/include/o2cb.
All programs have been modified to explicitly include <o2cb/o2cb.h>.
This removes the need for specifying a separate include path for o2cb,
as well as the O2CB_FLAT_INCLUDES define.
In addition, the private libo2cb headers have been moved directly into
the libo2cb directly, so that they are easier to manage with the libo2cb
sources.
Signed-off-by: Joel Becker <joel.becker at oracle.com>
---
debugfs.ocfs2/Makefile | 4 +-
extras/Makefile | 4 +-
fsck.ocfs2/Makefile | 5 +-
fswreck/Makefile | 4 +-
include/Makefile | 2 +-
include/o2cb/.gitignore | 1 +
include/o2cb/Makefile | 27 +++++++
include/o2cb/o2cb.h | 104 ++++++++++++++++++++++++++
include/o2cb/ocfs2_heartbeat.h | 37 ++++++++++
include/o2cb/ocfs2_nodemanager.h | 39 ++++++++++
libo2cb/Makefile | 26 ++------
libo2cb/include/.gitignore | 2 -
libo2cb/include/o2cb.h | 116 ------------------------------
libo2cb/include/o2cb_abi.h | 43 -----------
libo2cb/include/o2cb_crc32.h | 31 --------
libo2cb/include/ocfs2_heartbeat.h | 37 ----------
libo2cb/include/ocfs2_nodemanager.h | 39 ----------
libo2cb/o2cb_abi.c | 3 +-
libo2cb/o2cb_abi.h | 43 +++++++++++
libo2cb/o2cb_crc32.h | 31 ++++++++
libocfs2/Makefile | 4 +-
libocfs2/include/ocfs2.h | 5 +-
listuuid/Makefile | 10 +--
mkfs.ocfs2/Makefile | 6 +-
mount.ocfs2/Makefile | 6 +-
mount.ocfs2/mount.ocfs2.c | 1 -
mounted.ocfs2/Makefile | 6 +-
o2cb_ctl/Makefile | 6 +-
o2cb_ctl/o2cb_config.c | 2 +-
o2cb_ctl/o2cb_ctl.c | 2 +-
ocfs2_hb_ctl/Makefile | 6 +-
ocfs2cdsl/Makefile | 5 +-
ocfs2console/ocfs2interface/Makefile | 4 +-
ocfs2console/ocfs2interface/o2cbmodule.c | 5 +-
sizetest/Makefile | 4 +-
tunefs.ocfs2/Makefile | 4 +-
36 files changed, 325 insertions(+), 349 deletions(-)
create mode 100644 include/o2cb/.gitignore
create mode 100644 include/o2cb/Makefile
create mode 100644 include/o2cb/o2cb.h
create mode 100644 include/o2cb/ocfs2_heartbeat.h
create mode 100644 include/o2cb/ocfs2_nodemanager.h
delete mode 100644 libo2cb/include/.gitignore
delete mode 100644 libo2cb/include/o2cb.h
delete mode 100644 libo2cb/include/o2cb_abi.h
delete mode 100644 libo2cb/include/o2cb_crc32.h
delete mode 100644 libo2cb/include/ocfs2_heartbeat.h
delete mode 100644 libo2cb/include/ocfs2_nodemanager.h
create mode 100644 libo2cb/o2cb_abi.h
create mode 100644 libo2cb/o2cb_crc32.h
diff --git a/debugfs.ocfs2/Makefile b/debugfs.ocfs2/Makefile
index 96667f9..78ef6e5 100644
--- a/debugfs.ocfs2/Makefile
+++ b/debugfs.ocfs2/Makefile
@@ -6,9 +6,9 @@ sbindir = $(root_sbindir)
SBIN_PROGRAMS = debugfs.ocfs2
DEFINES = -DG_DISABLE_DEPRECATED -DLINUX -DDEBUGOCFS -DDEBUG
-DEFINES += -DOCFS2_FLAT_INCLUDES -DVERSION=\"$(VERSION)\" -DO2CB_FLAT_INCLUDES
+DEFINES += -DOCFS2_FLAT_INCLUDES -DVERSION=\"$(VERSION)\"
-INCLUDES = -I$(TOPDIR)/include -Iinclude -I$(TOPDIR)/libocfs2/include -I$(TOPDIR)/libo2cb/include
+INCLUDES = -I$(TOPDIR)/include -Iinclude -I$(TOPDIR)/libocfs2/include
INCLUDES += $(GLIB_CFLAGS)
ifdef OCFS2_DEBUG
diff --git a/extras/Makefile b/extras/Makefile
index ad2c9d5..dab57b4 100644
--- a/extras/Makefile
+++ b/extras/Makefile
@@ -13,11 +13,11 @@ CFLAGS = $(OPTS) $(WARNINGS)
UNINST_PROGRAMS = find_hardlinks find_dup_extents find_inode_paths set_random_bits decode_lockres encode_lockres mark_journal_dirty find_allocation_fragments compute_groups
-INCLUDES = -I$(TOPDIR)/include -I../libocfs2/include -I$(TOPDIR)/libo2cb/include
+INCLUDES = -I$(TOPDIR)/include -I../libocfs2/include
OPTIMIZE = -O2
-DEFINES += -DOCFS2_FLAT_INCLUDES -DO2CB_FLAT_INCLUDES
+DEFINES += -DOCFS2_FLAT_INCLUDES
CFLAGS += $(OPTIMIZE)
diff --git a/fsck.ocfs2/Makefile b/fsck.ocfs2/Makefile
index 564bcc3..9feac20 100644
--- a/fsck.ocfs2/Makefile
+++ b/fsck.ocfs2/Makefile
@@ -5,8 +5,7 @@ include $(TOPDIR)/Preamble.make
sbindir = $(root_sbindir)
SBIN_PROGRAMS = fsck.ocfs2
-INCLUDES = -I$(TOPDIR)/include -Iinclude -I$(TOPDIR)/libocfs2/include \
- -I$(TOPDIR)/libo2cb/include
+INCLUDES = -I$(TOPDIR)/include -Iinclude -I$(TOPDIR)/libocfs2/include
LIBOCFS2_LIBS = -L$(TOPDIR)/libocfs2 -locfs2
LIBOCFS2_DEPS = $(TOPDIR)/libocfs2/libocfs2.a
LIBO2DLM_LIBS = -L$(TOPDIR)/libo2dlm -lo2dlm
@@ -27,7 +26,7 @@ endif
CFLAGS := $(OPTS) -Wall -Wstrict-prototypes -Wmissing-prototypes \
-Wmissing-declarations
-DEFINES = -DOCFS2_FLAT_INCLUDES -DO2CB_FLAT_INCLUDES
+DEFINES = -DOCFS2_FLAT_INCLUDES
CFILES = fsck.c \
dirblocks.c \
diff --git a/fswreck/Makefile b/fswreck/Makefile
index a7fa789..c8da5a2 100644
--- a/fswreck/Makefile
+++ b/fswreck/Makefile
@@ -5,9 +5,9 @@ include $(TOPDIR)/Preamble.make
SBIN_PROGRAMS = fswreck
DEFINES = -DG_DISABLE_DEPRECATED -DLINUX
-DEFINES += -DOCFS2_FLAT_INCLUDES -DO2CB_FLAT_INCLUDES -DVERSION=\"$(VERSION)\"
+DEFINES += -DOCFS2_FLAT_INCLUDES -DVERSION=\"$(VERSION)\"
-INCLUDES = -I$(TOPDIR)/include -Iinclude -I$(TOPDIR)/libocfs2/include -I$(TOPDIR)/libo2cb/include
+INCLUDES = -I$(TOPDIR)/include -Iinclude -I$(TOPDIR)/libocfs2/include
INCLUDES += $(GLIB_CFLAGS)
ifdef OCFS2_DEBUG
diff --git a/include/Makefile b/include/Makefile
index 68470e3..6a946b0 100644
--- a/include/Makefile
+++ b/include/Makefile
@@ -2,6 +2,6 @@ TOPDIR = ..
include $(TOPDIR)/Preamble.make
-SUBDIRS = ocfs2fs o2dlm
+SUBDIRS = ocfs2fs o2dlm o2cb
include $(TOPDIR)/Postamble.make
diff --git a/include/o2cb/.gitignore b/include/o2cb/.gitignore
new file mode 100644
index 0000000..a2a9739
--- /dev/null
+++ b/include/o2cb/.gitignore
@@ -0,0 +1 @@
+o2cb_err.h
diff --git a/include/o2cb/Makefile b/include/o2cb/Makefile
new file mode 100644
index 0000000..59bfd7c
--- /dev/null
+++ b/include/o2cb/Makefile
@@ -0,0 +1,27 @@
+TOPDIR = ../..
+
+include $(TOPDIR)/Preamble.make
+
+HFILES_GEN = o2cb_err.h
+
+all: $(HFILES_GEN)
+
+HFILES = o2cb.h ocfs2_nodemanager.h ocfs2_heartbeat.h
+
+HEADERS_SUBDIR = o2cb
+HEADERS = $(HFILES) $(HFILES_GEN)
+
+o2cb_err.h: $(TOPDIR)/libo2cb/o2cb_err.h
+ cp $< $@
+
+$(TOPDIR)/libo2cb/o2cb_err.h:
+ make -C $(TOPDIR)/libo2cb o2cb_err.h
+
+DIST_FILES = $(HFILES)
+
+CLEAN_RULES = clean-err
+
+clean-err:
+ rm -f o2cb_err.h
+
+include $(TOPDIR)/Postamble.make
diff --git a/include/o2cb/o2cb.h b/include/o2cb/o2cb.h
new file mode 100644
index 0000000..52de0a4
--- /dev/null
+++ b/include/o2cb/o2cb.h
@@ -0,0 +1,104 @@
+/* -*- mode: c; c-basic-offset: 8; -*-
+ * vim: noexpandtab sw=8 ts=8 sts=0:
+ *
+ * o2cb.h
+ *
+ * Routines for accessing the o2cb configuration.
+ *
+ * Copyright (C) 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.
+ */
+
+#ifndef _O2CB_H
+#define _O2CB_H
+
+#ifndef _XOPEN_SOURCE
+# define _XOPEN_SOURCE 600
+#endif
+#ifndef _LARGEFILE64_SOURCE
+# define _LARGEFILE64_SOURCE
+#endif
+
+#include <stdio.h>
+#include <stdint.h>
+#include <sys/stat.h>
+#include <time.h>
+
+#include <linux/types.h>
+
+#include <et/com_err.h>
+
+#include <ocfs2fs/sparse_endian_types.h>
+
+#include <o2cb/o2cb_err.h>
+#include <o2cb/ocfs2_nodemanager.h>
+#include <o2cb/ocfs2_heartbeat.h>
+
+errcode_t o2cb_init(void);
+
+errcode_t o2cb_create_cluster(const char *cluster_name);
+errcode_t o2cb_remove_cluster(const char *cluster_name);
+
+errcode_t o2cb_add_node(const char *cluster_name,
+ const char *node_name, const char *node_num,
+ const char *ip_address, const char *ip_port,
+ const char *local);
+errcode_t o2cb_del_node(const char *cluster_name, const char *node_name);
+
+errcode_t o2cb_list_clusters(char ***clusters);
+void o2cb_free_cluster_list(char **clusters);
+
+errcode_t o2cb_list_nodes(char *cluster_name, char ***nodes);
+void o2cb_free_nodes_list(char **nodes);
+
+struct o2cb_region_desc {
+ char *r_name;
+ char *r_device_name;
+ int r_block_bytes;
+ uint64_t r_start_block;
+ uint64_t r_blocks;
+};
+
+/* Expected use case for the region descriptor is to allocate it on
+ * the stack and completely fill it before calling
+ * start_heartbeat_region. */
+errcode_t o2cb_start_heartbeat_region(const char *cluster_name,
+ struct o2cb_region_desc *desc);
+errcode_t o2cb_stop_heartbeat_region(const char *cluster_name,
+ const char *region_name);
+errcode_t o2cb_start_heartbeat_region_perm(const char *cluster_name,
+ struct o2cb_region_desc *desc);
+errcode_t o2cb_stop_heartbeat_region_perm(const char *cluster_name,
+ const char *region_name);
+
+errcode_t o2cb_get_hb_thread_pid (const char *cluster_name,
+ const char *region_name,
+ pid_t *pid);
+
+errcode_t o2cb_get_region_ref(const char *region_name,
+ int undo);
+errcode_t o2cb_put_region_ref(const char *region_name,
+ int undo);
+errcode_t o2cb_num_region_refs(const char *region_name,
+ int *num_refs);
+
+errcode_t o2cb_get_node_num(const char *cluster_name,
+ const char *node_name,
+ uint16_t *node_num);
+
+errcode_t o2cb_get_hb_ctl_path(char *buf, int count);
+
+#endif /* _O2CB_H */
diff --git a/include/o2cb/ocfs2_heartbeat.h b/include/o2cb/ocfs2_heartbeat.h
new file mode 100644
index 0000000..9409606
--- /dev/null
+++ b/include/o2cb/ocfs2_heartbeat.h
@@ -0,0 +1,37 @@
+/* -*- mode: c; c-basic-offset: 8; -*-
+ * vim: noexpandtab sw=8 ts=8 sts=0:
+ *
+ * ocfs2_heartbeat.h
+ *
+ * On-disk structures for ocfs2_heartbeat
+ *
+ * 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 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_HEARTBEAT_H
+#define _OCFS2_HEARTBEAT_H
+
+struct o2hb_disk_heartbeat_block {
+ __le64 hb_seq;
+ __u8 hb_node;
+ __u8 hb_pad1[3];
+ __le32 hb_cksum;
+ __le64 hb_generation;
+};
+
+#endif /* _OCFS2_HEARTBEAT_H */
diff --git a/include/o2cb/ocfs2_nodemanager.h b/include/o2cb/ocfs2_nodemanager.h
new file mode 100644
index 0000000..5b9854b
--- /dev/null
+++ b/include/o2cb/ocfs2_nodemanager.h
@@ -0,0 +1,39 @@
+/* -*- mode: c; c-basic-offset: 8; -*-
+ * vim: noexpandtab sw=8 ts=8 sts=0:
+ *
+ * ocfs2_nodemanager.h
+ *
+ * Header describing the interface between userspace and the kernel
+ * for the ocfs2_nodemanager module.
+ *
+ * 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 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_NODEMANAGER_H
+#define _OCFS2_NODEMANAGER_H
+
+#define O2NM_API_VERSION 5
+
+#define O2NM_MAX_NODES 255
+#define O2NM_INVALID_NODE_NUM 255
+
+/* host name, group name, cluster name all 64 bytes */
+#define O2NM_MAX_NAME_LEN 64 // __NEW_UTS_LEN
+
+#endif /* _OCFS2_NODEMANAGER_H */
diff --git a/libo2cb/Makefile b/libo2cb/Makefile
index 37a965f..d666bb5 100644
--- a/libo2cb/Makefile
+++ b/libo2cb/Makefile
@@ -11,12 +11,11 @@ else
OPTS += -O2
endif
-INCLUDES = -I$(TOPDIR)/include -Iinclude
+INCLUDES = -I$(TOPDIR)/include -I.
LIBRARIES = libo2cb.a
CFLAGS = $(OPTS) $(WARNINGS) -fPIC
-CPPFLAGS += -DO2CB_FLAT_INCLUDES
ifneq ($(OCFS2_DEBUG_EXE),)
DEBUG_EXE_FILES = $(shell awk '/DEBUG_EXE/{if (k[FILENAME] == 0) {print FILENAME; k[FILENAME] = 1;}}' $(CFILES))
@@ -40,27 +39,17 @@ CFILES = \
o2cb_abi.c \
o2cb_crc32.c
-HFILES = \
- include/ocfs2_nodemanager.h \
- include/ocfs2_heartbeat.h \
- include/o2cb_abi.h \
- include/o2cb_crc32.h \
- include/o2cb.h
+HFILES = \
+ o2cb_abi.h \
+ o2cb_crc32.h
-HFILES_GEN = \
- include/o2cb_err.h
-
-HEADERS_SUBDIR = o2cb
-HEADERS = $(HFILES) $(HFILES_GEN)
+HFILES_GEN = o2cb_err.h
OBJS = $(subst .c,.o,$(CFILES)) \
o2cb_err.o
$(OBJS): $(HFILES_GEN)
-include/o2cb_err.h: o2cb_err.h
- cp $< $@
-
o2cb_err.c o2cb_err.h: o2cb_err.et
compile_et o2cb_err.et
@@ -71,11 +60,6 @@ libo2cb.a: $(OBJS)
DIST_FILES = $(CFILES) $(HFILES) o2cb_err.et
-DIST_RULES = dist-subdircreate
-
-dist-subdircreate:
- $(TOPDIR)/mkinstalldirs $(DIST_DIR)/include
-
CLEAN_RULES = clean-err
clean-err:
diff --git a/libo2cb/include/.gitignore b/libo2cb/include/.gitignore
deleted file mode 100644
index 9c6ce2f..0000000
--- a/libo2cb/include/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-.*.sw?
-o2cb_err.h
diff --git a/libo2cb/include/o2cb.h b/libo2cb/include/o2cb.h
deleted file mode 100644
index 8712c48..0000000
--- a/libo2cb/include/o2cb.h
+++ /dev/null
@@ -1,116 +0,0 @@
-/* -*- mode: c; c-basic-offset: 8; -*-
- * vim: noexpandtab sw=8 ts=8 sts=0:
- *
- * o2cb.h
- *
- * Routines for accessing the o2cb configuration.
- *
- * Copyright (C) 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.
- */
-
-#ifndef _O2CB_H
-#define _O2CB_H
-
-#ifndef _XOPEN_SOURCE
-# define _XOPEN_SOURCE 600
-#endif
-#ifndef _LARGEFILE64_SOURCE
-# define _LARGEFILE64_SOURCE
-#endif
-
-#include <stdio.h>
-#include <stdint.h>
-#include <sys/stat.h>
-#include <time.h>
-
-#include <linux/types.h>
-
-#include <et/com_err.h>
-
-#include <ocfs2fs/sparse_endian_types.h>
-
-#if O2CB_FLAT_INCLUDES
-
-#include "o2cb_err.h"
-
-#include "ocfs2_nodemanager.h"
-#include "ocfs2_heartbeat.h"
-
-#else
-
-#include <o2cb/o2cb_err.h>
-
-#include <o2cb/ocfs2_nodemanager.h>
-#include <o2cb/ocfs2_heartbeat.h>
-
-#endif
-
-errcode_t o2cb_init(void);
-
-errcode_t o2cb_create_cluster(const char *cluster_name);
-errcode_t o2cb_remove_cluster(const char *cluster_name);
-
-errcode_t o2cb_add_node(const char *cluster_name,
- const char *node_name, const char *node_num,
- const char *ip_address, const char *ip_port,
- const char *local);
-errcode_t o2cb_del_node(const char *cluster_name, const char *node_name);
-
-errcode_t o2cb_list_clusters(char ***clusters);
-void o2cb_free_cluster_list(char **clusters);
-
-errcode_t o2cb_list_nodes(char *cluster_name, char ***nodes);
-void o2cb_free_nodes_list(char **nodes);
-
-struct o2cb_region_desc {
- char *r_name;
- char *r_device_name;
- int r_block_bytes;
- uint64_t r_start_block;
- uint64_t r_blocks;
-};
-
-/* Expected use case for the region descriptor is to allocate it on
- * the stack and completely fill it before calling
- * start_heartbeat_region. */
-errcode_t o2cb_start_heartbeat_region(const char *cluster_name,
- struct o2cb_region_desc *desc);
-errcode_t o2cb_stop_heartbeat_region(const char *cluster_name,
- const char *region_name);
-errcode_t o2cb_start_heartbeat_region_perm(const char *cluster_name,
- struct o2cb_region_desc *desc);
-errcode_t o2cb_stop_heartbeat_region_perm(const char *cluster_name,
- const char *region_name);
-
-errcode_t o2cb_get_hb_thread_pid (const char *cluster_name,
- const char *region_name,
- pid_t *pid);
-
-errcode_t o2cb_get_region_ref(const char *region_name,
- int undo);
-errcode_t o2cb_put_region_ref(const char *region_name,
- int undo);
-errcode_t o2cb_num_region_refs(const char *region_name,
- int *num_refs);
-
-errcode_t o2cb_get_node_num(const char *cluster_name,
- const char *node_name,
- uint16_t *node_num);
-
-errcode_t o2cb_get_hb_ctl_path(char *buf, int count);
-
-#endif /* _O2CB_H */
diff --git a/libo2cb/include/o2cb_abi.h b/libo2cb/include/o2cb_abi.h
deleted file mode 100644
index df25020..0000000
--- a/libo2cb/include/o2cb_abi.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/* -*- mode: c; c-basic-offset: 8; -*-
- * vim: noexpandtab sw=8 ts=8 sts=0:
- *
- * o2cb_abi.c
- *
- * Layout of configfs paths for O2CB cluster configuration.
- *
- * Copyright (C) 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, 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.
- */
-
-#ifndef _O2CB_ABI_H
-#define _O2CB_ABI_H
-
-/*
- * The latest place is /sys/kernel/config, but older O2CB put it
- * at /config. So, libo2cb has to handle detection
- */
-#define CONFIGFS_FORMAT_PATH "%s/config"
-
-#define O2CB_FORMAT_CLUSTER_DIR CONFIGFS_FORMAT_PATH "/cluster"
-#define O2CB_FORMAT_CLUSTER O2CB_FORMAT_CLUSTER_DIR "/%s"
-#define O2CB_FORMAT_NODE_DIR O2CB_FORMAT_CLUSTER "/node"
-#define O2CB_FORMAT_NODE O2CB_FORMAT_NODE_DIR "/%s"
-#define O2CB_FORMAT_NODE_ATTR O2CB_FORMAT_NODE "/%s"
-#define O2CB_FORMAT_HEARTBEAT_DIR O2CB_FORMAT_CLUSTER "/heartbeat"
-#define O2CB_FORMAT_HEARTBEAT_REGION O2CB_FORMAT_HEARTBEAT_DIR "/%s"
-#define O2CB_FORMAT_HEARTBEAT_REGION_ATTR O2CB_FORMAT_HEARTBEAT_REGION "/%s"
-
-#endif /* _O2CB_ABI_H */
diff --git a/libo2cb/include/o2cb_crc32.h b/libo2cb/include/o2cb_crc32.h
deleted file mode 100644
index 6d56a68..0000000
--- a/libo2cb/include/o2cb_crc32.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/* -*- mode: c; c-basic-offset: 8; -*-
- * vim: noexpandtab sw=8 ts=8 sts=0:
- *
- * o2cb_crc32.h
- *
- * libo2cb interface to crc32 functionality.
- *
- * Copyright (C) 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, 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.
- *
- */
-
-#ifndef _O2CB_CRC32_H
-#define _O2CB_CRC32_H
-
-unsigned long o2cb_crc32(const char *s);
-
-#endif /* _O2CB_CRC32_H */
diff --git a/libo2cb/include/ocfs2_heartbeat.h b/libo2cb/include/ocfs2_heartbeat.h
deleted file mode 100644
index 9409606..0000000
--- a/libo2cb/include/ocfs2_heartbeat.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/* -*- mode: c; c-basic-offset: 8; -*-
- * vim: noexpandtab sw=8 ts=8 sts=0:
- *
- * ocfs2_heartbeat.h
- *
- * On-disk structures for ocfs2_heartbeat
- *
- * 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 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_HEARTBEAT_H
-#define _OCFS2_HEARTBEAT_H
-
-struct o2hb_disk_heartbeat_block {
- __le64 hb_seq;
- __u8 hb_node;
- __u8 hb_pad1[3];
- __le32 hb_cksum;
- __le64 hb_generation;
-};
-
-#endif /* _OCFS2_HEARTBEAT_H */
diff --git a/libo2cb/include/ocfs2_nodemanager.h b/libo2cb/include/ocfs2_nodemanager.h
deleted file mode 100644
index 5b9854b..0000000
--- a/libo2cb/include/ocfs2_nodemanager.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/* -*- mode: c; c-basic-offset: 8; -*-
- * vim: noexpandtab sw=8 ts=8 sts=0:
- *
- * ocfs2_nodemanager.h
- *
- * Header describing the interface between userspace and the kernel
- * for the ocfs2_nodemanager module.
- *
- * 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 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_NODEMANAGER_H
-#define _OCFS2_NODEMANAGER_H
-
-#define O2NM_API_VERSION 5
-
-#define O2NM_MAX_NODES 255
-#define O2NM_INVALID_NODE_NUM 255
-
-/* host name, group name, cluster name all 64 bytes */
-#define O2NM_MAX_NAME_LEN 64 // __NEW_UTS_LEN
-
-#endif /* _OCFS2_NODEMANAGER_H */
diff --git a/libo2cb/o2cb_abi.c b/libo2cb/o2cb_abi.c
index 4d07d60..7cf2efa 100644
--- a/libo2cb/o2cb_abi.c
+++ b/libo2cb/o2cb_abi.c
@@ -42,10 +42,9 @@
#include <linux/types.h>
-#include "o2cb.h"
+#include "o2cb/o2cb.h"
#include "o2cb_abi.h"
#include "o2cb_crc32.h"
-#include "ocfs2_nodemanager.h"
static char *configfs_path;
diff --git a/libo2cb/o2cb_abi.h b/libo2cb/o2cb_abi.h
new file mode 100644
index 0000000..df25020
--- /dev/null
+++ b/libo2cb/o2cb_abi.h
@@ -0,0 +1,43 @@
+/* -*- mode: c; c-basic-offset: 8; -*-
+ * vim: noexpandtab sw=8 ts=8 sts=0:
+ *
+ * o2cb_abi.c
+ *
+ * Layout of configfs paths for O2CB cluster configuration.
+ *
+ * Copyright (C) 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, 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.
+ */
+
+#ifndef _O2CB_ABI_H
+#define _O2CB_ABI_H
+
+/*
+ * The latest place is /sys/kernel/config, but older O2CB put it
+ * at /config. So, libo2cb has to handle detection
+ */
+#define CONFIGFS_FORMAT_PATH "%s/config"
+
+#define O2CB_FORMAT_CLUSTER_DIR CONFIGFS_FORMAT_PATH "/cluster"
+#define O2CB_FORMAT_CLUSTER O2CB_FORMAT_CLUSTER_DIR "/%s"
+#define O2CB_FORMAT_NODE_DIR O2CB_FORMAT_CLUSTER "/node"
+#define O2CB_FORMAT_NODE O2CB_FORMAT_NODE_DIR "/%s"
+#define O2CB_FORMAT_NODE_ATTR O2CB_FORMAT_NODE "/%s"
+#define O2CB_FORMAT_HEARTBEAT_DIR O2CB_FORMAT_CLUSTER "/heartbeat"
+#define O2CB_FORMAT_HEARTBEAT_REGION O2CB_FORMAT_HEARTBEAT_DIR "/%s"
+#define O2CB_FORMAT_HEARTBEAT_REGION_ATTR O2CB_FORMAT_HEARTBEAT_REGION "/%s"
+
+#endif /* _O2CB_ABI_H */
diff --git a/libo2cb/o2cb_crc32.h b/libo2cb/o2cb_crc32.h
new file mode 100644
index 0000000..6d56a68
--- /dev/null
+++ b/libo2cb/o2cb_crc32.h
@@ -0,0 +1,31 @@
+/* -*- mode: c; c-basic-offset: 8; -*-
+ * vim: noexpandtab sw=8 ts=8 sts=0:
+ *
+ * o2cb_crc32.h
+ *
+ * libo2cb interface to crc32 functionality.
+ *
+ * Copyright (C) 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, 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.
+ *
+ */
+
+#ifndef _O2CB_CRC32_H
+#define _O2CB_CRC32_H
+
+unsigned long o2cb_crc32(const char *s);
+
+#endif /* _O2CB_CRC32_H */
diff --git a/libocfs2/Makefile b/libocfs2/Makefile
index e4f89e2..a7269a8 100644
--- a/libocfs2/Makefile
+++ b/libocfs2/Makefile
@@ -11,7 +11,7 @@ else
OPTS += -O2
endif
-INCLUDES = -I$(TOPDIR)/include -Iinclude -I$(TOPDIR)/libo2cb/include
+INCLUDES = -I$(TOPDIR)/include -Iinclude
LIBRARIES = libocfs2.a
@@ -22,7 +22,7 @@ LIBO2CB_LIBS = -L$(TOPDIR)/libo2cb -lo2cb
LIBO2CB_DEPS = $(TOPDIR)/libo2cb/libo2cb.a
CFLAGS = $(OPTS) $(WARNINGS) -fPIC
-CPPFLAGS += -DOCFS2_FLAT_INCLUDES -DO2CB_FLAT_INCLUDES
+CPPFLAGS += -DOCFS2_FLAT_INCLUDES
ifneq ($(OCFS2_DEBUG_EXE),)
DEBUG_EXE_FILES = $(shell awk '/DEBUG_EXE/{if (k[FILENAME] == 0) {print FILENAME; k[FILENAME] = 1;}}' $(CFILES))
diff --git a/libocfs2/include/ocfs2.h b/libocfs2/include/ocfs2.h
index b1e2634..6446314 100644
--- a/libocfs2/include/ocfs2.h
+++ b/libocfs2/include/ocfs2.h
@@ -52,16 +52,13 @@
#include <ocfs2fs/kernel-list.h>
#include <ocfs2fs/ocfs2_fs.h>
#include <o2dlm/o2dlm.h>
+#include <o2cb/o2cb.h>
#if OCFS2_FLAT_INCLUDES
-#include "o2cb.h"
-
#include "kernel-rbtree.h"
#include "ocfs2_err.h"
#include "jbd.h"
#else
-#include <o2cb/o2cb.h>
-
#include <ocfs2/kernel-rbtree.h>
#include <ocfs2/ocfs2_err.h>
#include <ocfs2/jbd.h>
diff --git a/listuuid/Makefile b/listuuid/Makefile
index 21662f4..bcef721 100644
--- a/listuuid/Makefile
+++ b/listuuid/Makefile
@@ -2,9 +2,7 @@ TOPDIR = ..
include $(TOPDIR)/Preamble.make
-INCLUDES = -I$(TOPDIR)/include -Iinclude -I$(TOPDIR)/libocfs2/include \
- -I$(TOPDIR)/libocfs2cluster/include \
- -I$(TOPDIR)/libo2cb/include
+INCLUDES = -I$(TOPDIR)/include -I$(TOPDIR)/libocfs2/include
LIBOCFS2_LIBS = -L$(TOPDIR)/libocfs2 -locfs2
LIBOCFS2_DEPS = $(TOPDIR)/libocfs2/libocfs2.a
@@ -24,7 +22,7 @@ endif
CFLAGS := $(OPTS) -Wall -Wstrict-prototypes -Wmissing-prototypes \
-Wmissing-declarations
-DEFINES = -DOCFS2_FLAT_INCLUDES -DO2CB_FLAT_INCLUDES
+DEFINES = -DOCFS2_FLAT_INCLUDES
UNINST_PROGRAMS = listuuid
@@ -33,10 +31,6 @@ CFILES = listuuid.c
OBJS = $(subst .c,.o,$(CFILES))
DIST_FILES = $(CFILES)
-DIST_RULES = dist-subdircreate
-
-dist-subdircreate:
- $(TOPDIR)/mkinstalldirs $(DIST_DIR)/include
listuuid: $(OBJS) $(LIBOCFS2_DEPS) $(LIBO2DLM_DEPS) $(LIBO2CB_DEPS)
$(LINK) $(LIBOCFS2_LIBS) $(LIBO2DLM_LIBS) $(COM_ERR_LIBS) $(UUID_LIBS)
diff --git a/mkfs.ocfs2/Makefile b/mkfs.ocfs2/Makefile
index 7472436..4748818 100644
--- a/mkfs.ocfs2/Makefile
+++ b/mkfs.ocfs2/Makefile
@@ -20,16 +20,14 @@ LIBOCFS2_CFLAGS = -I$(TOPDIR)/libocfs2/include
LIBOCFS2_LIBS = -L$(TOPDIR)/libocfs2 -locfs2
LIBOCFS2_DEPS = $(TOPDIR)/libocfs2/libocfs2.a
-LIBO2CB_CFLAGS = -I$(TOPDIR)/libo2cb/include
LIBO2CB_LIBS = -L$(TOPDIR)/libo2cb -lo2cb
LIBO2CB_DEPS = $(TOPDIR)/libo2cb/libo2cb.a
LIBO2DLM_LIBS = -L$(TOPDIR)/libo2dlm -lo2dlm
LIBO2DLM_DEPS = $(TOPDIR)/libo2dlm/libo2dlm.a
-INCLUDES = -I$(TOPDIR)/include $(LIBOCFS2_CFLAGS) $(LIBO2CB_CFLAGS) -I.
-DEFINES = -DOCFS2_FLAT_INCLUDES -DVERSION=\"$(VERSION)\" \
- -DO2CB_FLAT_INCLUDES
+INCLUDES = -I$(TOPDIR)/include $(LIBOCFS2_CFLAGS) -I.
+DEFINES = -DOCFS2_FLAT_INCLUDES -DVERSION=\"$(VERSION)\"
CFILES = mkfs.c check.c
HFILES = mkfs.h
diff --git a/mount.ocfs2/Makefile b/mount.ocfs2/Makefile
index b87b86a..b1f8859 100644
--- a/mount.ocfs2/Makefile
+++ b/mount.ocfs2/Makefile
@@ -5,8 +5,7 @@ include $(TOPDIR)/Preamble.make
sbindir = $(root_sbindir)
SBIN_PROGRAMS = mount.ocfs2
-INCLUDES = -I$(TOPDIR)/include -Iinclude -I$(TOPDIR)/libocfs2/include \
- -I$(TOPDIR)/libo2cb/include
+INCLUDES = -I$(TOPDIR)/include -I$(TOPDIR)/libocfs2/include
LIBOCFS2_LIBS = -L$(TOPDIR)/libocfs2 -locfs2
LIBOCFS2_DEPS = $(TOPDIR)/libocfs2/libocfs2.a
LIBO2DLM_LIBS = -L$(TOPDIR)/libo2dlm -lo2dlm
@@ -23,8 +22,7 @@ endif
CFLAGS := $(OPTS) -Wall -Wstrict-prototypes -Wmissing-prototypes \
-Wmissing-declarations
-DEFINES = -DOCFS2_FLAT_INCLUDES \
- -DO2CB_FLAT_INCLUDES -DVERSION=\"$(VERSION)\"
+DEFINES = -DOCFS2_FLAT_INCLUDES -DVERSION=\"$(VERSION)\"
CFILES = opts.c mount.ocfs2.c
CFILES += fstab.c mntent.c realpath.c sundries.c xmalloc.c
diff --git a/mount.ocfs2/mount.ocfs2.c b/mount.ocfs2/mount.ocfs2.c
index c89d8c9..96da2cd 100644
--- a/mount.ocfs2/mount.ocfs2.c
+++ b/mount.ocfs2/mount.ocfs2.c
@@ -21,7 +21,6 @@
*/
#include "mount.ocfs2.h"
-#include "o2cb.h"
#define OCFS2_FS_NAME "ocfs2"
diff --git a/mounted.ocfs2/Makefile b/mounted.ocfs2/Makefile
index e9a67cc..890fbce 100644
--- a/mounted.ocfs2/Makefile
+++ b/mounted.ocfs2/Makefile
@@ -11,8 +11,7 @@ else
OPTS = -O2
endif
-CFLAGS = $(OPTS) $(WARNINGS) -DOCFS2_FLAT_INCLUDES \
- -DO2CB_FLAT_INCLUDES
+CFLAGS = $(OPTS) $(WARNINGS) -DOCFS2_FLAT_INCLUDES
LIBOCFS2_LIBS = -L$(TOPDIR)/libocfs2 -locfs2
LIBOCFS2_DEPS = $(TOPDIR)/libocfs2/libocfs2.a
@@ -26,8 +25,7 @@ LIBO2CB_DEPS = $(TOPDIR)/libo2cb/libo2cb.a
sbindir = $(root_sbindir)
SBIN_PROGRAMS = mounted.ocfs2
-INCLUDES = -I$(TOPDIR)/include -I$(TOPDIR)/libocfs2/include \
- -I$(TOPDIR)/libo2cb/include
+INCLUDES = -I$(TOPDIR)/include -I$(TOPDIR)/libocfs2/include
CFILES = mounted.c
OBJS = $(subst .c,.o,$(CFILES))
diff --git a/o2cb_ctl/Makefile b/o2cb_ctl/Makefile
index 817548e..82be918 100644
--- a/o2cb_ctl/Makefile
+++ b/o2cb_ctl/Makefile
@@ -5,8 +5,8 @@ include $(TOPDIR)/Preamble.make
sbindir = $(root_sbindir)
SBIN_PROGRAMS = o2cb_ctl
-INCLUDES = -I$(TOPDIR)/include -Iinclude -I$(TOPDIR)/libocfs2/include \
- -I$(TOPDIR)/libo2cb/include
+INCLUDES = -I$(TOPDIR)/include -I$(TOPDIR)/libocfs2/include
+
LIBOCFS2_LIBS = -L$(TOPDIR)/libocfs2 -locfs2
LIBOCFS2_DEPS = $(TOPDIR)/libocfs2/libocfs2.a
@@ -26,7 +26,7 @@ endif
CFLAGS := $(OPTS) -Wall -Wstrict-prototypes -Wmissing-prototypes \
-Wmissing-declarations
-DEFINES = -DO2CB_FLAT_INCLUDES -DVERSION=\"$(VERSION)\"
+DEFINES = -DVERSION=\"$(VERSION)\"
O2CB_CTL_CFILES = o2cb_ctl.c o2cb_config.c \
jconfig.c jiterator.c
diff --git a/o2cb_ctl/o2cb_config.c b/o2cb_ctl/o2cb_config.c
index ba1a93f..cdb37cf 100644
--- a/o2cb_ctl/o2cb_config.c
+++ b/o2cb_ctl/o2cb_config.c
@@ -35,7 +35,7 @@
#include "jconfig.h"
#include "o2cb_config.h"
-#include "o2cb.h"
+#include "o2cb/o2cb.h"
struct _O2CBConfig {
diff --git a/o2cb_ctl/o2cb_ctl.c b/o2cb_ctl/o2cb_ctl.c
index f3a9a88..51c1bb2 100644
--- a/o2cb_ctl/o2cb_ctl.c
+++ b/o2cb_ctl/o2cb_ctl.c
@@ -38,7 +38,7 @@
#include "jiterator.h"
#include "o2cb_config.h"
-#include "o2cb.h"
+#include "o2cb/o2cb.h"
#define PROGNAME "o2cb_ctl"
#define O2CB_CONFIG_FILE "/etc/ocfs2/cluster.conf"
diff --git a/ocfs2_hb_ctl/Makefile b/ocfs2_hb_ctl/Makefile
index e690486..5489c58 100644
--- a/ocfs2_hb_ctl/Makefile
+++ b/ocfs2_hb_ctl/Makefile
@@ -5,8 +5,7 @@ include $(TOPDIR)/Preamble.make
sbindir = $(root_sbindir)
SBIN_PROGRAMS = ocfs2_hb_ctl
-INCLUDES = -I$(TOPDIR)/include -Iinclude -I$(TOPDIR)/libocfs2/include \
- -I$(TOPDIR)/libo2cb/include
+INCLUDES = -I$(TOPDIR)/include -Iinclude -I$(TOPDIR)/libocfs2/include
LIBOCFS2_LIBS = -L$(TOPDIR)/libocfs2 -locfs2
LIBOCFS2_DEPS = $(TOPDIR)/libocfs2/libocfs2.a
LIBO2DLM_LIBS = -L$(TOPDIR)/libo2dlm -lo2dlm
@@ -27,8 +26,7 @@ endif
CFLAGS := $(OPTS) -Wall -Wstrict-prototypes -Wmissing-prototypes \
-Wmissing-declarations
-DEFINES = -DOCFS2_FLAT_INCLUDES \
- -DO2CB_FLAT_INCLUDES -DVERSION=\"$(VERSION)\"
+DEFINES = -DOCFS2_FLAT_INCLUDES -DVERSION=\"$(VERSION)\"
CFILES = ocfs2_hb_ctl.c
diff --git a/ocfs2cdsl/Makefile b/ocfs2cdsl/Makefile
index b2e7fd0..ddb2874 100644
--- a/ocfs2cdsl/Makefile
+++ b/ocfs2cdsl/Makefile
@@ -15,7 +15,6 @@ LIBOCFS2_DEPS = $(TOPDIR)/libocfs2/libocfs2.a
LIBO2DLM_LIBS = -L$(TOPDIR)/libo2dlm -lo2dlm
LIBO2DLM_DEPS = $(TOPDIR)/libo2dlm/libo2dlm.a
-LIBO2CB_CFLAGS = -I$(TOPDIR)/libo2cb/include
LIBO2CB_LIBS = -L$(TOPDIR)/libo2cb -lo2cb
LIBO2CB_DEPS = $(TOPDIR)/libo2cb/libo2cb.a
@@ -25,10 +24,10 @@ sbindir = $(root_sbindir)
SBIN_PROGRAMS = ocfs2cdsl
DEFINES = -DVERSION=\"$(VERSION)\"
-DEFINES += -DOCFS2_FLAT_INCLUDES -DO2CB_FLAT_INCLUDES
+DEFINES += -DOCFS2_FLAT_INCLUDES
DEFINES += -DG_DISABLE_DEPRECATED
-INCLUDES = -I$(TOPDIR)/include $(LIBOCFS2_CFLAGS) $(LIBO2CB_CFLAGS) $(GLIB_CFLAGS)
+INCLUDES = -I$(TOPDIR)/include $(LIBOCFS2_CFLAGS) $(GLIB_CFLAGS)
OPTIMIZE = -O2
diff --git a/ocfs2console/ocfs2interface/Makefile b/ocfs2console/ocfs2interface/Makefile
index 55b8f8d..b418e3f 100644
--- a/ocfs2console/ocfs2interface/Makefile
+++ b/ocfs2console/ocfs2interface/Makefile
@@ -22,7 +22,6 @@ LIBOCFS2_DEPS = $(TOPDIR)/libocfs2/libocfs2.a
LIBO2DLM_LIBS = -L$(TOPDIR)/libo2dlm -lo2dlm
LIBO2DLM_DEPS = $(TOPDIR)/libo2dlm/libo2dlm.a
-LIBO2CB_CFLAGS = -I$(TOPDIR)/libo2cb/include
LIBO2CB_LIBS = -L$(TOPDIR)/libo2cb -lo2cb
LIBO2CB_DEPS = $(TOPDIR)/libo2cb/libo2cb.a
@@ -35,8 +34,7 @@ BLKID_CFLAGS = -I$(TOPDIR)/ocfs2console
BLKID_LIBS = -L$(TOPDIR)/ocfs2console/blkid -lblkid-internal $(UUID_LIBS)
endif
-O2CB_CPPFLAGS = -DO2CB_FLAT_INCLUDES $(LIBO2CB_CFLAGS)
-OCFS2_CPPFLAGS = -DOCFS2_FLAT_INCLUDES $(LIBOCFS2_CFLAGS) $(O2CB_CPPFLAGS)
+OCFS2_CPPFLAGS = -DOCFS2_FLAT_INCLUDES $(LIBOCFS2_CFLAGS)
GLIB_CPPFLAGS = $(GLIB_CFLAGS) -DG_DISABLE_DEPRECATED
diff --git a/ocfs2console/ocfs2interface/o2cbmodule.c b/ocfs2console/ocfs2interface/o2cbmodule.c
index 81b0707..9b2db0a 100644
--- a/ocfs2console/ocfs2interface/o2cbmodule.c
+++ b/ocfs2console/ocfs2interface/o2cbmodule.c
@@ -26,8 +26,7 @@
#include <Python.h>
#include <structmember.h>
-#include "o2cb.h"
-#include "o2cb_abi.h"
+#include "o2cb/o2cb.h"
/* FIXME: right now we don't wrap the init function */
@@ -214,6 +213,8 @@ cluster_add_node (Cluster *self,
}
#if 0
+#include "o2cb_abi.h"
+
static PyObject *
cluster_create_heartbeat_region_disk (Cluster *self,
PyObject *args,
diff --git a/sizetest/Makefile b/sizetest/Makefile
index b794555..ceacea3 100644
--- a/sizetest/Makefile
+++ b/sizetest/Makefile
@@ -15,8 +15,8 @@ CFLAGS = $(OPTS) $(WARNINGS)
UNINST_PROGRAMS = sizetest.ocfs2
-INCLUDES = -I$(TOPDIR)/include -I$(TOPDIR)/libocfs2/include -I$(TOPDIR)/libo2cb/include
-DEFINES = -DOCFS2_FLAT_INCLUDES -DVERSION=\"$(VERSION)\" -DO2CB_FLAT_INCLUDES
+INCLUDES = -I$(TOPDIR)/include -I$(TOPDIR)/libocfs2/include
+DEFINES = -DOCFS2_FLAT_INCLUDES -DVERSION=\"$(VERSION)\"
CFILES = sizetest.c
OBJS = $(subst .c,.o,$(CFILES))
diff --git a/tunefs.ocfs2/Makefile b/tunefs.ocfs2/Makefile
index 719ddbd..55e653d 100644
--- a/tunefs.ocfs2/Makefile
+++ b/tunefs.ocfs2/Makefile
@@ -25,9 +25,9 @@ LIBO2CB_DEPS = $(TOPDIR)/libo2cb/libo2cb.a
sbindir = $(root_sbindir)
SBIN_PROGRAMS = tunefs.ocfs2
-INCLUDES = -I$(TOPDIR)/include -I$(TOPDIR)/libocfs2/include -I$(TOPDIR)/libo2cb/include -I.
+INCLUDES = -I$(TOPDIR)/include -I$(TOPDIR)/libocfs2/include -I.
INCLUDES += $(GLIB_CFLAGS)
-DEFINES = -DOCFS2_FLAT_INCLUDES -DVERSION=\"$(VERSION)\" -DO2CB_FLAT_INCLUDES
+DEFINES = -DOCFS2_FLAT_INCLUDES -DVERSION=\"$(VERSION)\"
MANS = tunefs.ocfs2.8
--
1.5.2.2
More information about the Ocfs2-tools-devel
mailing list