[Ocfs2-commits] jlbec commits r1821 - in trunk/fs/ocfs2: . cluster
dlm
svn-commits at oss.oracle.com
svn-commits at oss.oracle.com
Fri Jan 21 14:42:56 CST 2005
Author: jlbec
Date: 2005-01-21 14:42:55 -0600 (Fri, 21 Jan 2005)
New Revision: 1821
Added:
trunk/fs/ocfs2/cluster/clcommon.h
Modified:
trunk/fs/ocfs2/Makefile
trunk/fs/ocfs2/cluster/
trunk/fs/ocfs2/cluster/Makefile
trunk/fs/ocfs2/cluster/heartbeat.c
trunk/fs/ocfs2/cluster/nodemanager.c
trunk/fs/ocfs2/cluster/nodemanager.h
trunk/fs/ocfs2/cluster/tcp.c
trunk/fs/ocfs2/cluster/tcp.h
trunk/fs/ocfs2/cluster/util.c
trunk/fs/ocfs2/dlm/
trunk/fs/ocfs2/dlm/Makefile
trunk/fs/ocfs2/dlm/dlmast.c
trunk/fs/ocfs2/dlm/dlmcommon.h
trunk/fs/ocfs2/dlm/dlmconvert.c
trunk/fs/ocfs2/dlm/dlmlock.c
trunk/fs/ocfs2/dlm/dlmmaster.c
trunk/fs/ocfs2/dlm/dlmmod.c
trunk/fs/ocfs2/dlm/dlmrecovery.c
trunk/fs/ocfs2/dlm/dlmthread.c
trunk/fs/ocfs2/dlm/dlmunlock.c
trunk/fs/ocfs2/dlm/util.c
trunk/fs/ocfs2/dlm/util.h
trunk/fs/ocfs2/dlmglue.c
trunk/fs/ocfs2/heartbeat.c
trunk/fs/ocfs2/ocfs.h
trunk/fs/ocfs2/super.c
trunk/fs/ocfs2/vote.c
Log:
Step 8 - Make new cluster/dlm layout compile
o Move compat stuff to cluster/cl_compat.h, because it's all the cluster
code that uses it.
o Move cluster_disk to cluster/clcommon.h, because that's where it
belongs.
o Fix makefiles to have the appropriate -I paths.
o Fix dlm/*.c to look at "cluster/header.h" instead of just "header.h",
etc.
o Fix ocfs2/ocfs.h to look at "dlm/dlmmod.h" instead of just "dlmmod.h,
etc.
o Make every file include the headers they need to compile. Ugh.
Modified: trunk/fs/ocfs2/Makefile
===================================================================
--- trunk/fs/ocfs2/Makefile 2005-01-21 02:25:52 UTC (rev 1820)
+++ trunk/fs/ocfs2/Makefile 2005-01-21 20:42:55 UTC (rev 1821)
@@ -62,7 +62,7 @@
# Since SUBDIRS means something to kbuild, define them safely. Do not
# include trailing slashes.
#
-SAFE_SUBDIRS = cluster
+SAFE_SUBDIRS = cluster dlm
SOURCES = \
24io.c \
@@ -156,7 +156,6 @@
INSTALL_RULES = install-modules
-
ifneq ($(KERNEL_26),)
#
# This is a 2.6 kernel. Just forward to kbuild.
Property changes on: trunk/fs/ocfs2/cluster
___________________________________________________________________
Name: svn:ignore
- *.sw?
stamp-md5
.*.cmd
*.ko
.tmp_versions
.*.d
*.mod.c
+ .*.sw?
stamp-md5
.*.cmd
*.ko
.tmp_versions
.*.d
*.mod.c
Modified: trunk/fs/ocfs2/cluster/Makefile
===================================================================
--- trunk/fs/ocfs2/cluster/Makefile 2005-01-21 02:25:52 UTC (rev 1820)
+++ trunk/fs/ocfs2/cluster/Makefile 2005-01-21 20:42:55 UTC (rev 1821)
@@ -29,11 +29,8 @@
endif
-obj-m := ocfs2_dlm.o ocfs2_heartbeat.o ocfs2_nodemanager.o ocfs2_tcp.o
+obj-m := ocfs2_heartbeat.o ocfs2_nodemanager.o ocfs2_tcp.o
-ocfs2_dlm-objs := dlmmod.o dlmthread.o dlmrecovery.o util.o \
- dlmmaster.o dlmast.o dlmconvert.o dlmlock.o dlmunlock.o
-
ocfs2_nodemanager-objs := nodemanager.o util.o transaction_file.o $(COMPAT_LIBFS)
ocfs2_heartbeat-objs := heartbeat.o util.o transaction_file.o $(COMPAT_LIBFS)
@@ -48,14 +45,6 @@
SOURCES = \
compat_libfs.c \
- dlmmaster.c \
- dlmmod.c \
- dlmast.c \
- dlmconvert.c \
- dlmlock.c \
- dlmunlock.c \
- dlmrecovery.c \
- dlmthread.c \
heartbeat.c \
nodemanager.c \
tcp.c \
@@ -63,10 +52,8 @@
util.c
HEADERS = \
+ cl_compat.h \
compat_libfs.h \
- dlm_compat.h \
- dlmcommon.h \
- dlmmod.h \
heartbeat.h \
nodemanager.h \
tcp.h \
Added: trunk/fs/ocfs2/cluster/clcommon.h
===================================================================
--- trunk/fs/ocfs2/cluster/clcommon.h 2005-01-21 02:25:52 UTC (rev 1820)
+++ trunk/fs/ocfs2/cluster/clcommon.h 2005-01-21 20:42:55 UTC (rev 1821)
@@ -0,0 +1,49 @@
+/* -*- mode: c; c-basic-offset: 8; -*-
+ * vim: noexpandtab sw=8 ts=8 sts=0:
+ *
+ * clcommon.h
+ *
+ * Common stuff
+ *
+ * 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 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.
+ *
+ * Authors: Kurt Hackel
+ */
+
+#ifndef CLUSTER_CLCOMMON_H
+#define CLUSTER_CLCOMMON_H
+
+typedef struct _nm_ctxt nm_ctxt;
+typedef struct _heartbeat_ctxt heartbeat_ctxt;
+
+#define CLUSTER_DISK_UUID_LEN 32 // 16 byte binary == 32 char hex string
+
+typedef struct _cluster_disk
+{
+ // uuid of disk
+ char uuid[CLUSTER_DISK_UUID_LEN+1];
+ // all the rest are for heartbeat
+ dev_t dev;
+ u32 blocksize_bits;
+ u32 num_blocks;
+ u64 start_block;
+ util_rarray slots;
+} cluster_disk;
+
+
+#endif /* CLUSTER_CLCOMMON_H */
Modified: trunk/fs/ocfs2/cluster/heartbeat.c
===================================================================
--- trunk/fs/ocfs2/cluster/heartbeat.c 2005-01-21 02:25:52 UTC (rev 1820)
+++ trunk/fs/ocfs2/cluster/heartbeat.c 2005-01-21 20:42:55 UTC (rev 1821)
@@ -64,9 +64,9 @@
#include <asm/uaccess.h>
-#include "dlm_compat.h"
+#include "cl_compat.h"
#include "util.h"
-#include "dlmcommon.h"
+#include "clcommon.h"
#include "heartbeat.h"
#include "tcp.h"
Modified: trunk/fs/ocfs2/cluster/nodemanager.c
===================================================================
--- trunk/fs/ocfs2/cluster/nodemanager.c 2005-01-21 02:25:52 UTC (rev 1820)
+++ trunk/fs/ocfs2/cluster/nodemanager.c 2005-01-21 20:42:55 UTC (rev 1821)
@@ -27,9 +27,9 @@
#include "warning_hack.h"
-#include "dlm_compat.h"
+#include "cl_compat.h"
#include "util.h"
-#include "dlmcommon.h"
+#include "clcommon.h"
#include <linux/module.h>
#include <linux/kernel.h>
@@ -69,7 +69,6 @@
#include <asm/uaccess.h>
#include "tcp.h"
-#include "dlmmod.h"
#include "nodemanager.h"
#include "heartbeat.h"
@@ -164,7 +163,6 @@
nm_cluster *nm_get_cluster(void);
struct inode *nm_get_group_by_name(char *node_name);
struct inode *nm_get_node_by_name(char *node_name);
-int nm_init(dlm_ctxt *dlm);
static void nm_do_callbacks(int type, void *ptr1, void *ptr2, u16 idx);
/* support for adding files, dirs, hardlinks in /proc/cluster/nm/... */
@@ -1189,11 +1187,6 @@
return slot_num;
}
-int nm_init(dlm_ctxt *dlm)
-{
- return 0;
-}
-
int nm_register_callback(int type, void (*func)(void *, void *, u16))
{
nm_callback_func *f;
Modified: trunk/fs/ocfs2/cluster/nodemanager.h
===================================================================
--- trunk/fs/ocfs2/cluster/nodemanager.h 2005-01-21 02:25:52 UTC (rev 1820)
+++ trunk/fs/ocfs2/cluster/nodemanager.h 2005-01-21 20:42:55 UTC (rev 1821)
@@ -137,7 +137,6 @@
u16 nm_this_node(struct inode *group);
-int nm_init(struct _dlm_ctxt *dlm);
nm_cluster * nm_get_cluster(void);
int nm_register_callback(int type, void (*func)(void *, void *, u16));
int nm_unregister_callback(int type, void (*func)(void *, void *, u16));
Modified: trunk/fs/ocfs2/cluster/tcp.c
===================================================================
--- trunk/fs/ocfs2/cluster/tcp.c 2005-01-21 02:25:52 UTC (rev 1820)
+++ trunk/fs/ocfs2/cluster/tcp.c 2005-01-21 20:42:55 UTC (rev 1821)
@@ -95,9 +95,8 @@
#include <asm/uaccess.h>
-#include "dlm_compat.h"
+#include "cl_compat.h"
#include "util.h"
-#include "dlmcommon.h"
#include "heartbeat.h"
Modified: trunk/fs/ocfs2/cluster/tcp.h
===================================================================
--- trunk/fs/ocfs2/cluster/tcp.h 2005-01-21 02:25:52 UTC (rev 1820)
+++ trunk/fs/ocfs2/cluster/tcp.h 2005-01-21 20:42:55 UTC (rev 1821)
@@ -28,6 +28,8 @@
#ifndef CLUSTER_TCP_H
#define CLUSTER_TCP_H
+#include <linux/version.h>
+
#include <linux/socket.h>
#ifdef __KERNEL__
#include <net/sock.h>
@@ -38,6 +40,11 @@
#include <linux/inet.h>
#include <linux/in.h>
+/*
+ * FIXME: no need for clcommon.h and nodemanager.h except for
+ * NM_MAX_NAME_LEN...shouldn't that be something or somewhere else?
+ */
+#include "clcommon.h"
#include "nodemanager.h"
#include "ocfs2_tcp.h"
Modified: trunk/fs/ocfs2/cluster/util.c
===================================================================
--- trunk/fs/ocfs2/cluster/util.c 2005-01-21 02:25:52 UTC (rev 1820)
+++ trunk/fs/ocfs2/cluster/util.c 2005-01-21 20:42:55 UTC (rev 1821)
@@ -27,8 +27,9 @@
#include "warning_hack.h"
-#include "dlm_compat.h"
+#include "cl_compat.h"
+#include <linux/version.h>
#include <linux/fs.h>
#include <linux/types.h>
#include <linux/mm.h>
Property changes on: trunk/fs/ocfs2/dlm
___________________________________________________________________
Name: svn:ignore
+ .*.sw?
stamp-md5
.*.cmd
*.ko
.tmp_versions
.*.d
*.mod.c
Modified: trunk/fs/ocfs2/dlm/Makefile
===================================================================
--- trunk/fs/ocfs2/dlm/Makefile 2005-01-21 02:25:52 UTC (rev 1820)
+++ trunk/fs/ocfs2/dlm/Makefile 2005-01-21 20:42:55 UTC (rev 1821)
@@ -3,51 +3,39 @@
TOPDIR = ../../..
include $(TOPDIR)/Preamble.make
+
+CLUSTERINC = $(TOPDIR)/fs/ocfs2
else
# We are included by kbuild.
OUR_TOPDIR := $(M)/..
include $(OUR_TOPDIR)/Config.make
+CLUSTERINC = $(OUR_TOPDIR)/fs/ocfs2
endif
+MODULE_CFLAGS += -I$(CLUSTERINC)
+
ifdef HAVE_NPTL
MODULE_DEFINES += -DHAVE_NPTL
endif
-ifdef HAVE_SOCK_CREATE_LITE
-MODULE_DEFINES += -DHAVE_SOCK_CREATE_LITE
-endif
+EXTRA_CFLAGS += $(MODULE_CFLAGS) $(MODULE_DEFINES)
-EXTRA_CFLAGS += $(MODULE_DEFINES)
+obj-m := ocfs2_dlm.o
-ifeq ($(KERNELRELEASE),)
-ifeq ($(KERNEL_26),)
-COMPAT_LIBFS := compat_libfs.o
-endif
-endif
-
-
-obj-m := ocfs2_dlm.o ocfs2_heartbeat.o ocfs2_nodemanager.o ocfs2_tcp.o
-
ocfs2_dlm-objs := dlmmod.o dlmthread.o dlmrecovery.o util.o \
dlmmaster.o dlmast.o dlmconvert.o dlmlock.o dlmunlock.o
-ocfs2_nodemanager-objs := nodemanager.o util.o transaction_file.o $(COMPAT_LIBFS)
-ocfs2_heartbeat-objs := heartbeat.o util.o transaction_file.o $(COMPAT_LIBFS)
-ocfs2_tcp-objs := tcp.o util.o $(COMPAT_LIBFS)
-
-
ifeq ($(KERNELRELEASE),)
#
# Called from a regular "make".
#
SOURCES = \
- compat_libfs.c \
dlmmaster.c \
dlmmod.c \
dlmast.c \
@@ -56,21 +44,11 @@
dlmunlock.c \
dlmrecovery.c \
dlmthread.c \
- heartbeat.c \
- nodemanager.c \
- tcp.c \
- transaction_file.c \
util.c
HEADERS = \
- compat_libfs.h \
- dlm_compat.h \
dlmcommon.h \
dlmmod.h \
- heartbeat.h \
- nodemanager.h \
- tcp.h \
- transaction_file.h \
util.h \
warning_hack.h
Modified: trunk/fs/ocfs2/dlm/dlmast.c
===================================================================
--- trunk/fs/ocfs2/dlm/dlmast.c 2005-01-21 02:25:52 UTC (rev 1820)
+++ trunk/fs/ocfs2/dlm/dlmast.c 2005-01-21 20:42:55 UTC (rev 1821)
@@ -27,10 +27,6 @@
#include "warning_hack.h"
-#include "dlm_compat.h"
-#include "util.h"
-#include "dlmcommon.h"
-
#include <linux/module.h>
#include <linux/fs.h>
#include <linux/types.h>
@@ -40,19 +36,19 @@
#include <linux/init.h>
#include <linux/sysctl.h>
#include <linux/random.h>
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-#include <linux/statfs.h>
-#include <linux/moduleparam.h>
-#endif
#include <linux/blkdev.h>
#include <linux/socket.h>
#include <linux/inet.h>
#include <linux/spinlock.h>
+#include "util.h"
-#include "heartbeat.h"
-#include "nodemanager.h"
-#include "tcp.h"
+#include "cluster/clcommon.h"
+#include "cluster/heartbeat.h"
+#include "cluster/nodemanager.h"
+#include "cluster/tcp.h"
+
+#include "dlmcommon.h"
#include "dlmmod.h"
static int dlm_send_proxy_ast(dlm_ctxt *dlm, dlm_lock_resource *res,
Modified: trunk/fs/ocfs2/dlm/dlmcommon.h
===================================================================
--- trunk/fs/ocfs2/dlm/dlmcommon.h 2005-01-21 02:25:52 UTC (rev 1820)
+++ trunk/fs/ocfs2/dlm/dlmcommon.h 2005-01-21 20:42:55 UTC (rev 1821)
@@ -30,23 +30,6 @@
#define DLM_ASSERT(x) ({ if (!(x)) { printk("assert failed! %s:%d\n", __FILE__, __LINE__); BUG(); } })
-typedef struct _nm_ctxt nm_ctxt;
typedef struct _dlm_ctxt dlm_ctxt;
-typedef struct _heartbeat_ctxt heartbeat_ctxt;
-#define CLUSTER_DISK_UUID_LEN 32 // 16 byte binary == 32 char hex string
-
-typedef struct _cluster_disk
-{
- // uuid of disk
- char uuid[CLUSTER_DISK_UUID_LEN+1];
- // all the rest are for heartbeat
- dev_t dev;
- u32 blocksize_bits;
- u32 num_blocks;
- u64 start_block;
- util_rarray slots;
-} cluster_disk;
-
-
#endif /* CLUSTER_DLMCOMMON_H */
Modified: trunk/fs/ocfs2/dlm/dlmconvert.c
===================================================================
--- trunk/fs/ocfs2/dlm/dlmconvert.c 2005-01-21 02:25:52 UTC (rev 1820)
+++ trunk/fs/ocfs2/dlm/dlmconvert.c 2005-01-21 20:42:55 UTC (rev 1821)
@@ -27,10 +27,6 @@
#include "warning_hack.h"
-#include "dlm_compat.h"
-#include "util.h"
-#include "dlmcommon.h"
-
#include <linux/module.h>
#include <linux/fs.h>
#include <linux/types.h>
@@ -40,19 +36,19 @@
#include <linux/init.h>
#include <linux/sysctl.h>
#include <linux/random.h>
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-#include <linux/statfs.h>
-#include <linux/moduleparam.h>
-#endif
#include <linux/blkdev.h>
#include <linux/socket.h>
#include <linux/inet.h>
#include <linux/spinlock.h>
+#include "util.h"
-#include "heartbeat.h"
-#include "nodemanager.h"
-#include "tcp.h"
+#include "cluster/clcommon.h"
+#include "cluster/heartbeat.h"
+#include "cluster/nodemanager.h"
+#include "cluster/tcp.h"
+
+#include "dlmcommon.h"
#include "dlmmod.h"
Modified: trunk/fs/ocfs2/dlm/dlmlock.c
===================================================================
--- trunk/fs/ocfs2/dlm/dlmlock.c 2005-01-21 02:25:52 UTC (rev 1820)
+++ trunk/fs/ocfs2/dlm/dlmlock.c 2005-01-21 20:42:55 UTC (rev 1821)
@@ -27,10 +27,6 @@
#include "warning_hack.h"
-#include "dlm_compat.h"
-#include "util.h"
-#include "dlmcommon.h"
-
#include <linux/module.h>
#include <linux/fs.h>
#include <linux/types.h>
@@ -40,19 +36,19 @@
#include <linux/init.h>
#include <linux/sysctl.h>
#include <linux/random.h>
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-#include <linux/statfs.h>
-#include <linux/moduleparam.h>
-#endif
#include <linux/blkdev.h>
#include <linux/socket.h>
#include <linux/inet.h>
#include <linux/spinlock.h>
+#include "util.h"
-#include "heartbeat.h"
-#include "nodemanager.h"
-#include "tcp.h"
+#include "cluster/clcommon.h"
+#include "cluster/heartbeat.h"
+#include "cluster/nodemanager.h"
+#include "cluster/tcp.h"
+
+#include "dlmcommon.h"
#include "dlmmod.h"
static dlm_status dlm_send_remote_lock_request(dlm_ctxt *dlm,
Modified: trunk/fs/ocfs2/dlm/dlmmaster.c
===================================================================
--- trunk/fs/ocfs2/dlm/dlmmaster.c 2005-01-21 02:25:52 UTC (rev 1820)
+++ trunk/fs/ocfs2/dlm/dlmmaster.c 2005-01-21 20:42:55 UTC (rev 1821)
@@ -27,10 +27,6 @@
#include "warning_hack.h"
-#include "dlm_compat.h"
-#include "util.h"
-#include "dlmcommon.h"
-
#include <linux/module.h>
#include <linux/fs.h>
#include <linux/types.h>
@@ -40,19 +36,19 @@
#include <linux/init.h>
#include <linux/sysctl.h>
#include <linux/random.h>
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-#include <linux/statfs.h>
-#include <linux/moduleparam.h>
-#endif
#include <linux/blkdev.h>
#include <linux/socket.h>
#include <linux/inet.h>
#include <linux/spinlock.h>
+#include "util.h"
-#include "heartbeat.h"
-#include "nodemanager.h"
-#include "tcp.h"
+#include "cluster/clcommon.h"
+#include "cluster/heartbeat.h"
+#include "cluster/nodemanager.h"
+#include "cluster/tcp.h"
+
+#include "dlmcommon.h"
#include "dlmmod.h"
spinlock_t dlm_master_lock = SPIN_LOCK_UNLOCKED;
Modified: trunk/fs/ocfs2/dlm/dlmmod.c
===================================================================
--- trunk/fs/ocfs2/dlm/dlmmod.c 2005-01-21 02:25:52 UTC (rev 1820)
+++ trunk/fs/ocfs2/dlm/dlmmod.c 2005-01-21 20:42:55 UTC (rev 1821)
@@ -27,10 +27,6 @@
#include "warning_hack.h"
-#include "dlm_compat.h"
-#include "util.h"
-#include "dlmcommon.h"
-
#include <linux/module.h>
#include <linux/fs.h>
#include <linux/types.h>
@@ -40,19 +36,19 @@
#include <linux/init.h>
#include <linux/sysctl.h>
#include <linux/random.h>
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-#include <linux/statfs.h>
-#include <linux/moduleparam.h>
-#endif
#include <linux/blkdev.h>
#include <linux/socket.h>
#include <linux/inet.h>
#include <linux/spinlock.h>
+#include "util.h"
-#include "heartbeat.h"
-#include "nodemanager.h"
-#include "tcp.h"
+#include "cluster/clcommon.h"
+#include "cluster/heartbeat.h"
+#include "cluster/nodemanager.h"
+#include "cluster/tcp.h"
+
+#include "dlmcommon.h"
#include "dlmmod.h"
MODULE_LICENSE ("GPL");
Modified: trunk/fs/ocfs2/dlm/dlmrecovery.c
===================================================================
--- trunk/fs/ocfs2/dlm/dlmrecovery.c 2005-01-21 02:25:52 UTC (rev 1820)
+++ trunk/fs/ocfs2/dlm/dlmrecovery.c 2005-01-21 20:42:55 UTC (rev 1821)
@@ -27,10 +27,6 @@
#include "warning_hack.h"
-#include "dlm_compat.h"
-#include "util.h"
-#include "dlmcommon.h"
-
#include <linux/module.h>
#include <linux/fs.h>
#include <linux/types.h>
@@ -40,18 +36,18 @@
#include <linux/init.h>
#include <linux/sysctl.h>
#include <linux/random.h>
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-#include <linux/statfs.h>
-#include <linux/moduleparam.h>
-#endif
#include <linux/blkdev.h>
#include <linux/socket.h>
#include <linux/inet.h>
+#include "util.h"
-#include "heartbeat.h"
-#include "nodemanager.h"
-#include "tcp.h"
+#include "cluster/clcommon.h"
+#include "cluster/heartbeat.h"
+#include "cluster/nodemanager.h"
+#include "cluster/tcp.h"
+
+#include "dlmcommon.h"
#include "dlmmod.h"
static void dlm_do_local_recovery_cleanup(dlm_ctxt *dlm, u16 dead_node, int locked);
Modified: trunk/fs/ocfs2/dlm/dlmthread.c
===================================================================
--- trunk/fs/ocfs2/dlm/dlmthread.c 2005-01-21 02:25:52 UTC (rev 1820)
+++ trunk/fs/ocfs2/dlm/dlmthread.c 2005-01-21 20:42:55 UTC (rev 1821)
@@ -27,10 +27,6 @@
#include "warning_hack.h"
-#include "dlm_compat.h"
-#include "util.h"
-#include "dlmcommon.h"
-
#include <linux/module.h>
#include <linux/fs.h>
#include <linux/types.h>
@@ -40,18 +36,20 @@
#include <linux/init.h>
#include <linux/sysctl.h>
#include <linux/random.h>
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-#include <linux/statfs.h>
-#include <linux/moduleparam.h>
-#endif
#include <linux/blkdev.h>
#include <linux/socket.h>
#include <linux/inet.h>
+#include <linux/timer.h>
+#include "util.h"
-#include "heartbeat.h"
-#include "nodemanager.h"
-#include "tcp.h"
+#include "cluster/cl_compat.h"
+#include "cluster/clcommon.h"
+#include "cluster/heartbeat.h"
+#include "cluster/nodemanager.h"
+#include "cluster/tcp.h"
+
+#include "dlmcommon.h"
#include "dlmmod.h"
extern spinlock_t dlm_domain_lock;
Modified: trunk/fs/ocfs2/dlm/dlmunlock.c
===================================================================
--- trunk/fs/ocfs2/dlm/dlmunlock.c 2005-01-21 02:25:52 UTC (rev 1820)
+++ trunk/fs/ocfs2/dlm/dlmunlock.c 2005-01-21 20:42:55 UTC (rev 1821)
@@ -27,10 +27,6 @@
#include "warning_hack.h"
-#include "dlm_compat.h"
-#include "util.h"
-#include "dlmcommon.h"
-
#include <linux/module.h>
#include <linux/fs.h>
#include <linux/types.h>
@@ -40,19 +36,19 @@
#include <linux/init.h>
#include <linux/sysctl.h>
#include <linux/random.h>
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-#include <linux/statfs.h>
-#include <linux/moduleparam.h>
-#endif
#include <linux/blkdev.h>
#include <linux/socket.h>
#include <linux/inet.h>
#include <linux/spinlock.h>
+#include "util.h"
-#include "heartbeat.h"
-#include "nodemanager.h"
-#include "tcp.h"
+#include "cluster/clcommon.h"
+#include "cluster/heartbeat.h"
+#include "cluster/nodemanager.h"
+#include "cluster/tcp.h"
+
+#include "dlmcommon.h"
#include "dlmmod.h"
Modified: trunk/fs/ocfs2/dlm/util.c
===================================================================
--- trunk/fs/ocfs2/dlm/util.c 2005-01-21 02:25:52 UTC (rev 1820)
+++ trunk/fs/ocfs2/dlm/util.c 2005-01-21 20:42:55 UTC (rev 1821)
@@ -27,8 +27,7 @@
#include "warning_hack.h"
-#include "dlm_compat.h"
-
+#include <linux/version.h>
#include <linux/fs.h>
#include <linux/types.h>
#include <linux/mm.h>
Modified: trunk/fs/ocfs2/dlm/util.h
===================================================================
--- trunk/fs/ocfs2/dlm/util.h 2005-01-21 02:25:52 UTC (rev 1820)
+++ trunk/fs/ocfs2/dlm/util.h 2005-01-21 20:42:55 UTC (rev 1821)
@@ -32,6 +32,9 @@
#define SHUTDOWN_SIGS (sigmask(SIGKILL) | sigmask(SIGHUP) | \
sigmask(SIGINT) | sigmask(SIGQUIT))
+#include <linux/timer.h>
+#include <linux/wait.h>
+
/* timeout structure taken from Ben's aio.c */
typedef struct _util_timeout {
struct timer_list timer;
Modified: trunk/fs/ocfs2/dlmglue.c
===================================================================
--- trunk/fs/ocfs2/dlmglue.c 2005-01-21 02:25:52 UTC (rev 1820)
+++ trunk/fs/ocfs2/dlmglue.c 2005-01-21 20:42:55 UTC (rev 1821)
@@ -32,11 +32,12 @@
#include <linux/smp_lock.h>
#include <cluster/util.h>
-#include <cluster/dlmcommon.h>
+#include <cluster/clcommon.h>
#include <cluster/heartbeat.h>
#include <cluster/nodemanager.h>
#include <cluster/tcp.h>
-#include <cluster/dlmmod.h>
+#include <dlm/dlmcommon.h>
+#include <dlm/dlmmod.h>
#include "ocfs_log.h"
#include "ocfs.h"
Modified: trunk/fs/ocfs2/heartbeat.c
===================================================================
--- trunk/fs/ocfs2/heartbeat.c 2005-01-21 02:25:52 UTC (rev 1820)
+++ trunk/fs/ocfs2/heartbeat.c 2005-01-21 20:42:55 UTC (rev 1821)
@@ -32,8 +32,9 @@
#include <linux/highmem.h>
#include <cluster/util.h>
-#include <cluster/dlmcommon.h>
+#include <cluster/clcommon.h>
#include <cluster/heartbeat.h>
+#include <dlm/dlmcommon.h>
#include "ocfs_log.h"
#include "ocfs.h"
Modified: trunk/fs/ocfs2/ocfs.h
===================================================================
--- trunk/fs/ocfs2/ocfs.h 2005-01-21 02:25:52 UTC (rev 1820)
+++ trunk/fs/ocfs2/ocfs.h 2005-01-21 20:42:55 UTC (rev 1821)
@@ -42,11 +42,12 @@
# include <linux/tqueue.h>
#endif
-#include <cluster/util.h>
-#include <cluster/dlmcommon.h>
-#include <cluster/nodemanager.h>
-#include <cluster/tcp.h>
-#include <cluster/dlmmod.h>
+#include "cluster/util.h"
+#include "cluster/clcommon.h"
+#include "cluster/nodemanager.h"
+#include "cluster/tcp.h"
+#include "dlm/dlmcommon.h"
+#include "dlm/dlmmod.h"
/* convenience macro */
Modified: trunk/fs/ocfs2/super.c
===================================================================
--- trunk/fs/ocfs2/super.c 2005-01-21 02:25:52 UTC (rev 1820)
+++ trunk/fs/ocfs2/super.c 2005-01-21 20:42:55 UTC (rev 1821)
@@ -43,8 +43,9 @@
#include <linux/inet.h>
#include <cluster/util.h>
-#include <cluster/dlmcommon.h>
+#include <cluster/clcommon.h>
#include <cluster/nodemanager.h>
+#include <dlm/dlmcommon.h>
#include "ocfs_log.h"
#include "ocfs.h"
Modified: trunk/fs/ocfs2/vote.c
===================================================================
--- trunk/fs/ocfs2/vote.c 2005-01-21 02:25:52 UTC (rev 1820)
+++ trunk/fs/ocfs2/vote.c 2005-01-21 20:42:55 UTC (rev 1821)
@@ -31,11 +31,12 @@
#include <linux/smp_lock.h>
#include <cluster/util.h>
-#include <cluster/dlmcommon.h>
+#include <cluster/clcommon.h>
#include <cluster/heartbeat.h>
#include <cluster/nodemanager.h>
#include <cluster/tcp.h>
-#include <cluster/dlmmod.h>
+#include <dlm/dlmcommon.h>
+#include <dlm/dlmmod.h>
#include "ocfs_log.h"
#include "ocfs.h"
More information about the Ocfs2-commits
mailing list