#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/sysctl.h>
-#include <linux/proc_fs.h>
#include <linux/configfs.h>
#include "endian.h"
#include "tcp.h"
#include "nodemanager.h"
-#include "quorum.h"
#include "heartbeat.h"
-#include "disk_heartbeat.h"
#include "masklog.h"
-#include "ver.h"
#include "sys.h"
+#include "ver.h"
/* for now we operate under the assertion that there can be only one
* cluster active at a time. Changing this will require trickling
* cluster references throughout where nodes are looked up */
-struct o2nm_cluster *o2nm_single_cluster = NULL;
+static struct o2nm_cluster *o2nm_single_cluster = NULL;
#define OCFS2_MAX_HB_CTL_PATH 256
static char ocfs2_hb_ctl_path[OCFS2_MAX_HB_CTL_PATH] = "/sbin/ocfs2_hb_ctl";
}
EXPORT_SYMBOL_GPL(o2nm_get_hb_ctl_path);
+struct o2nm_cluster {
+ struct config_group cl_group;
+ unsigned cl_has_local:1;
+ u8 cl_local_node;
+ rwlock_t cl_nodes_lock;
+ struct o2nm_node *cl_nodes[O2NM_MAX_NODES];
+ struct rb_root cl_node_ip_tree;
+ /* this bitmap is part of a hack for disk bitmap.. will go eventually. - zab */
+ unsigned long cl_nodes_bitmap[BITS_TO_LONGS(O2NM_MAX_NODES)];
+};
+
struct o2nm_node *o2nm_get_node_by_num(u8 node_num)
{
struct o2nm_node *node = NULL;
: NULL;
}
+static struct o2nm_node *to_o2nm_node(struct config_item *item)
+{
+ return item ? container_of(item, struct o2nm_node, nd_item) : NULL;
+}
+
static void o2nm_node_release(struct config_item *item)
{
struct o2nm_node *node = to_o2nm_node(item);
struct config_group *o2hb_group = NULL, *ret = NULL;
void *defs = NULL;
- /* this runs under the parent dir's i_sem; there can be only
+ /* this runs under the parent dir's i_mutex; there can be only
* one caller in here at a time */
if (o2nm_single_cluster)
goto out; /* ENOSPC */
BUG_ON(o2nm_single_cluster != cluster);
o2nm_single_cluster = NULL;
- o2hb_free_hb_set(cluster->cl_group.default_groups[1]);
for (i = 0; cluster->cl_group.default_groups[i]; i++) {
killme = &cluster->cl_group.default_groups[i]->cg_item;
cluster->cl_group.default_groups[i] = NULL;
},
};
-#define O2NM_PROC_PATH "fs/ocfs2_nodemanager"
-static struct proc_dir_entry *o2nm_proc;
-
-#define O2NM_VERSION_PROC_NAME "interface_revision"
-#define O2NM_HB_DEAD_THRESHOLD_NAME "hb_dead_threshold"
-
-static void o2nm_remove_proc(struct proc_dir_entry *parent)
-{
- remove_proc_entry(O2NM_VERSION_PROC_NAME, parent);
- remove_proc_entry(O2NM_HB_DEAD_THRESHOLD_NAME, parent);
-}
-
static void __exit exit_o2nm(void)
{
if (ocfs2_table_header)
/* XXX sync with hb callbacks and shut down hb? */
o2net_unregister_hb_callbacks();
- o2hb_disk_heartbeat_exit();
- o2cb_sys_shutdown();
configfs_unregister_subsystem(&o2nm_cluster_group.cs_subsys);
- o2nm_remove_proc(o2nm_proc);
- mlog_remove_proc(o2nm_proc);
- o2net_proc_exit(o2nm_proc);
- remove_proc_entry(O2NM_PROC_PATH, NULL);
- o2net_exit();
-}
-
-static int o2nm_proc_read_uint(char *page, char **start, off_t off,
- int count, int *eof, unsigned int data)
-{
- int len;
-
- len = sprintf(page, "%u\n", data);
- if (len < 0)
- return len;
-
- if (len <= off + count)
- *eof = 1;
-
- *start = page + off;
-
- len -= off;
-
- if (len > count)
- len = count;
-
- if (len < 0)
- len = 0;
-
- return len;
-}
-
-static int o2nm_proc_version(char *page, char **start, off_t off,
- int count, int *eof, void *data)
-{
- return o2nm_proc_read_uint(page, start, off, count, eof,
- O2NM_API_VERSION);
-}
-
-static int o2nm_proc_threshold(char *page, char **start, off_t off,
- int count, int *eof, void *data)
-{
- return o2nm_proc_read_uint(page, start, off, count, eof,
- o2hb_dead_threshold);
-}
-
-static int o2nm_proc_write_threshold(struct file *file,
- const char __user *buffer,
- unsigned long count, void *data)
-{
- char buf[32];
- char *p = buf;
- unsigned long tmp;
-
- if (count > ARRAY_SIZE(buf) - 1)
- count = ARRAY_SIZE(buf) - 1;
-
- if (copy_from_user(buf, buffer, count))
- return -EFAULT;
-
- buf[ARRAY_SIZE(buf) - 1] = '\0';
-
- tmp = simple_strtoul(p, &p, 10);
- if (!p || (*p && (*p != '\n')))
- return -EINVAL;
-
- /* this will validate ranges for us. */
- o2hb_dead_threshold_set((unsigned int) tmp);
-
- return count;
-}
-
-static int o2nm_init_proc(struct proc_dir_entry *parent)
-{
- struct proc_dir_entry *p;
-
- p = create_proc_read_entry(O2NM_VERSION_PROC_NAME,
- S_IFREG | S_IRUGO,
- parent,
- o2nm_proc_version,
- NULL);
- if (!p)
- return -ENOMEM;
-
- p = create_proc_read_entry(O2NM_HB_DEAD_THRESHOLD_NAME,
- S_IFREG | S_IRUGO | S_IWUSR, parent,
- o2nm_proc_threshold,
- NULL);
- if (!p) {
- remove_proc_entry(O2NM_VERSION_PROC_NAME, parent);
- return -ENOMEM;
- }
- p->write_proc = o2nm_proc_write_threshold;
+ o2cb_sys_shutdown();
- return 0;
+ o2net_exit();
}
static int __init init_o2nm(void)
cluster_print_version();
o2hb_init();
- ret = o2hb_disk_heartbeat_init();
- if (ret)
- goto out;
-
o2net_init();
ocfs2_table_header = register_sysctl_table(ocfs2_root_table, 0);
goto out_callbacks;
}
- o2nm_proc = proc_mkdir(O2NM_PROC_PATH, NULL);
- if (o2nm_proc == NULL) {
- ret = -ENOMEM; /* shrug */
- goto out_subsys;
- }
-
- ret = mlog_init_proc(o2nm_proc);
- if (ret)
- goto out_remove;
-
- ret = o2net_proc_init(o2nm_proc);
- if (ret)
- goto out_mlog;
-
- ret = o2nm_init_proc(o2nm_proc);
- if (ret)
- goto out_proc;
-
ret = o2cb_sys_init();
- if (ret == 0)
+ if (!ret)
goto out;
- o2nm_remove_proc(o2nm_proc);
-out_proc:
- o2net_proc_exit(o2nm_proc);
-out_mlog:
- mlog_remove_proc(o2nm_proc);
-out_remove:
- remove_proc_entry(O2NM_PROC_PATH, NULL);
-out_subsys:
configfs_unregister_subsystem(&o2nm_cluster_group.cs_subsys);
out_callbacks:
o2net_unregister_hb_callbacks();
unregister_sysctl_table(ocfs2_table_header);
out_o2net:
o2net_exit();
- o2hb_disk_heartbeat_exit();
out:
return ret;
}
projects / linux-flexiantxendom0-3.2.10.git / blobdiff