[Ocfs2-commits] zab commits r1727 - trunk/cluster

svn-commits at oss.oracle.com svn-commits at oss.oracle.com
Thu Dec 30 13:02:53 CST 2004


Author: zab
Date: 2004-12-30 13:02:52 -0600 (Thu, 30 Dec 2004)
New Revision: 1727

Modified:
   trunk/cluster/dlmmod.c
   trunk/cluster/heartbeat.c
   trunk/cluster/nodemanager.c
   trunk/cluster/nodemanager.h
   trunk/cluster/tcp.c
   trunk/cluster/test.c
Log:
At least get modules loading in 2.6.

o don't pretend the anon filesystems use block devices
o export symbols that are used between modules


Modified: trunk/cluster/dlmmod.c
===================================================================
--- trunk/cluster/dlmmod.c	2004-12-30 02:33:50 UTC (rev 1726)
+++ trunk/cluster/dlmmod.c	2004-12-30 19:02:52 UTC (rev 1727)
@@ -317,6 +317,7 @@
 	lksb->status = status;
 	return status;
 }
+EXPORT_SYMBOL(dlmlock);
 
 dlm_status do_dlmlock(dlm_ctxt *dlm, dlm_lock_resource *res, dlm_lockstatus *lksb, int flags,
 		      int type, dlm_astlockfunc_t *ast, dlm_bastlockfunc_t *bast, void *data)
@@ -718,6 +719,7 @@
 		(*unlockast)(data, lksb->status);
 	return status;
 }
+EXPORT_SYMBOL(dlmunlock);
 
 
 dlm_status dlmunlock_local(dlm_ctxt *dlm, dlm_lock_resource *res, dlm_lock *lock, dlm_lockstatus *lksb, int flags, int *call_ast)
@@ -1312,11 +1314,13 @@
 	       	iput(group);
 	return dlm;
 }
+EXPORT_SYMBOL(dlm_register_domain);
 
 void dlm_unregister_domain(dlm_ctxt *dlm)
 {
 	// fill me in please
 }
+EXPORT_SYMBOL(dlm_unregister_domain);
 
 void dlm_init_lockres(dlm_lock_resource *res, struct qstr *lockname)
 {

Modified: trunk/cluster/heartbeat.c
===================================================================
--- trunk/cluster/heartbeat.c	2004-12-30 02:33:50 UTC (rev 1726)
+++ trunk/cluster/heartbeat.c	2004-12-30 19:02:52 UTC (rev 1727)
@@ -100,7 +100,6 @@
 
 
 /* globals */
-extern char *nm_nodename;
 static spinlock_t hb_lock = SPIN_LOCK_UNLOCKED;
 static LIST_HEAD(hb_net_groups);
 static LIST_HEAD(hb_disk_groups);
@@ -541,16 +540,14 @@
 				     const char *dev_name,
 				     void *data)
 {
-	return get_sb_bdev(fs_type, flags, dev_name, data, hb_fill_super);
+	return get_sb_single(fs_type, flags, data, hb_fill_super);
 }
 
 static struct file_system_type hb_fs_type = {
 	.owner          = THIS_MODULE,
 	.name           = "hb",
 	.get_sb         = hb_get_sb,
-	.kill_sb        = kill_block_super,
-	.fs_flags       = 0,
-	.next           = NULL
+	.kill_sb        = kill_anon_super,
 };
 #else
 static struct super_block *hb_read_super(struct super_block *sb,
@@ -807,6 +804,7 @@
 
 	return 0;
 }
+EXPORT_SYMBOL(hb_fill_node_map);
 
 int hb_register_callback(int type, hb_cb_func *func, void *data, int priority)
 {
@@ -844,6 +842,7 @@
 	spin_unlock(&hb_cb_lock);
 	return 0;
 }
+EXPORT_SYMBOL(hb_register_callback);
 
 int hb_unregister_callback(int type, hb_cb_func *func, void *data)
 {
@@ -880,9 +879,9 @@
 	spin_unlock(&hb_cb_lock);
 	return ret;
 }
+EXPORT_SYMBOL(hb_unregister_callback);
 
 
-
 static void hb_do_callbacks(int type, void *ptr1, void *ptr2, int idx)
 {
 	struct list_head *iter;

Modified: trunk/cluster/nodemanager.c
===================================================================
--- trunk/cluster/nodemanager.c	2004-12-30 02:33:50 UTC (rev 1726)
+++ trunk/cluster/nodemanager.c	2004-12-30 19:02:52 UTC (rev 1727)
@@ -142,6 +142,7 @@
 nm_cluster cluster;
 struct super_block *single_sb;
 char *nm_nodename;
+EXPORT_SYMBOL(nm_nodename);
 static spinlock_t nm_lock = SPIN_LOCK_UNLOCKED;
 static spinlock_t nm_cb_lock = SPIN_LOCK_UNLOCKED;
 struct list_head nm_callbacks[NM_NUM_CB];
@@ -437,8 +438,8 @@
 	}
 	return ret;
 }
+EXPORT_SYMBOL(nm_create_group);
 
-
 int nm_create_node(char *buf, nm_op *data)
 {
 	struct tree_descr desc;
@@ -536,6 +537,7 @@
 	g->state = NM_GROUP_READY;
 	return 0;
 }
+EXPORT_SYMBOL(nm_make_group_ready);
 
 int nm_add_node_to_group(char *buf, nm_op *data)
 {
@@ -614,8 +616,8 @@
 		iput(inode);
 	return ret;
 }
+EXPORT_SYMBOL(nm_add_node_to_group);
 
-
 int nm_remove_node_from_group(struct inode *group, struct inode *node)
 {
 	struct dentry *child = NULL;
@@ -787,6 +789,7 @@
 	*idx = next;
 	return util_rarray_idx_to_slot(&priv->disk.slots, next);
 }
+EXPORT_SYMBOL(nm_iterate_group_disk_slots);
 
 int nm_get_node_info(char *buf, nm_op *data)
 {
@@ -1017,8 +1020,8 @@
 	spin_unlock(&nm_ip_hash_lock);
 	return ret;
 }
+EXPORT_SYMBOL(nm_get_node_by_ip);
 
-
 struct inode * nm_get_group_by_num(u16 group_num)
 {
 	struct inode *inode;
@@ -1027,6 +1030,7 @@
 	spin_unlock(&nm_lock);
 	return inode;
 }
+EXPORT_SYMBOL(nm_get_group_by_num);
 
 nm_cluster * nm_get_cluster(void)
 {
@@ -1041,6 +1045,7 @@
 	spin_unlock(&nm_lock);
 	return inode;
 }
+EXPORT_SYMBOL(nm_get_node_by_num);
 
 struct inode * nm_get_group_node_by_index(struct inode *group, u16 index)
 {
@@ -1072,8 +1077,8 @@
 	dput(parent);
 	return inode;
 }
+EXPORT_SYMBOL(nm_get_group_node_by_index);
 
-
 struct inode * __nm_get_node_by_name(char *node_name, int dir)
 {
 	struct dentry *dentry = NULL;
@@ -1099,6 +1104,7 @@
 	}
 	return inode;
 }
+EXPORT_SYMBOL(__nm_get_node_by_name);
 
 
 /* 
@@ -1127,6 +1133,7 @@
 	//nmprintk("for group=%p, this node is %u\n", group, node_num);
 	return node_num;
 }
+EXPORT_SYMBOL(nm_this_node);
 
 /* slow */
 static u16 nm_get_group_index(struct inode *group, struct inode *inode, struct dentry **child)
@@ -1196,6 +1203,7 @@
 	spin_unlock(&nm_cb_lock);
 	return 0;
 }
+EXPORT_SYMBOL(nm_register_callback);
 
 #warning need to change nm callbacks to be like hb callbacks... no locks when calling.
 int nm_unregister_callback(int type, void (*func)(void *, void *, u16))
@@ -1220,9 +1228,8 @@
 	spin_unlock(&nm_cb_lock);
 	return ret;
 }
+EXPORT_SYMBOL(nm_unregister_callback);
 
-
-
 static void nm_do_callbacks(int type, void *ptr1, void *ptr2, u16 idx)
 {
 	struct list_head *iter;
@@ -1303,16 +1310,14 @@
 				     const char *dev_name,
 				     void *data)
 {
-	return get_sb_bdev(fs_type, flags, dev_name, data, nm_fill_super);
+	return get_sb_single(fs_type, flags, data, nm_fill_super);
 }
 
 static struct file_system_type nm_fs_type = {
 	.owner          = THIS_MODULE,
 	.name           = "nm",
 	.get_sb         = nm_get_sb,
-	.kill_sb        = kill_block_super,
-	.fs_flags       = 0,
-	.next           = NULL
+	.kill_sb        = kill_anon_super,
 };
 #else
 static struct super_block *nm_read_super(struct super_block *sb,

Modified: trunk/cluster/nodemanager.h
===================================================================
--- trunk/cluster/nodemanager.h	2004-12-30 02:33:50 UTC (rev 1726)
+++ trunk/cluster/nodemanager.h	2004-12-30 19:02:52 UTC (rev 1727)
@@ -207,6 +207,8 @@
 int nm_create_group(char *buf, nm_op *data);
 int nm_add_node_to_group(char *buf, nm_op *data);
 
+extern char *nm_nodename;
+
 #ifdef __KERNEL__
 
 

Modified: trunk/cluster/tcp.c
===================================================================
--- trunk/cluster/tcp.c	2004-12-30 02:33:50 UTC (rev 1726)
+++ trunk/cluster/tcp.c	2004-12-30 19:02:52 UTC (rev 1727)
@@ -620,6 +620,7 @@
 	spin_unlock(&net_handler_lock);
 	return 0;
 }
+EXPORT_SYMBOL(net_register_handler);
 
 
 
@@ -965,8 +966,8 @@
 		kfree(msg);
 	return ret;
 }
+EXPORT_SYMBOL(net_send_message);
 
-
 int net_send_message_arr(u32 msg_type, u32 key, int arrlen, net_data *arr, u32 len, struct inode *inode, int *status)
 {
 	int ret = 0, tmpret, i;
@@ -1109,6 +1110,7 @@
 		kfree(msg);
 	return ret;
 }
+EXPORT_SYMBOL(net_send_message_arr);
 
 
 

Modified: trunk/cluster/test.c
===================================================================
--- trunk/cluster/test.c	2004-12-30 02:33:50 UTC (rev 1726)
+++ trunk/cluster/test.c	2004-12-30 19:02:52 UTC (rev 1727)
@@ -87,7 +87,6 @@
 extern spinlock_t net_state_lock;
 extern u32 net_driver_state;
 extern struct file_operations transaction_ops;
-extern char *nm_nodename;
 extern u32 net_num_dispatched;
 
 
@@ -763,16 +762,14 @@
 				     const char *dev_name,
 				     void *data)
 {
-	return get_sb_bdev(fs_type, flags, dev_name, data, test_fill_super);
+	return get_sb_bdev(fs_type, flags, data, test_fill_super);
 }
 
 static struct file_system_type test_fs_type = {
 	.owner          = THIS_MODULE,
 	.name           = "test",
 	.get_sb         = test_get_sb,
-	.kill_sb        = kill_block_super,
-	.fs_flags       = 0,
-	.next           = NULL
+	.kill_sb        = kill_anon_super,
 };
 #else
 static struct super_block *test_read_super(struct super_block *sb,



More information about the Ocfs2-commits mailing list