diff options
| author |   Andrew Beekhof <abeekhof@suse.de> | 2006-12-04 14:04:53 +0100 |
|---|---|---|
| committer |   Mark Fasheh <mark.fasheh@oracle.com> | 2006-12-07 18:13:01 -0800 |
| commit | 296b75ed6a3b35f613961cefe4962ce1cf586d77 (patch) | |
| tree | 6bfb05e59a1794f1809c0fffa7a5ded247dc620c /fs/ocfs2/cluster/nodemanager.c | |
| parent | ocfs2: Synchronize feature incompat flags in ocfs2_fs.h (diff) | |
| download | linux-dev-296b75ed6a3b35f613961cefe4962ce1cf586d77.tar.xz linux-dev-296b75ed6a3b35f613961cefe4962ce1cf586d77.zip | |
[patch 1/3] OCFS2 - Expose struct o2nm_cluster
Subsequent patches (namely userspace heartbeat and configurable timeouts)
require access to the o2nm_cluster struct. This patch does the necessary
shuffling.
Signed-off-by: Andrew Beekhof <abeekhof@suse.de>
Signed-off-by: Mark Fasheh <mark.fasheh@oracle.com>
Diffstat (limited to 'fs/ocfs2/cluster/nodemanager.c')
| -rw-r--r-- | fs/ocfs2/cluster/nodemanager.c | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/fs/ocfs2/cluster/nodemanager.c b/fs/ocfs2/cluster/nodemanager.c index d11753c50bc1..dd4aefa11b3d 100644 --- a/fs/ocfs2/cluster/nodemanager.c +++ b/fs/ocfs2/cluster/nodemanager.c @@ -35,7 +35,7 @@ /* 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 */ -static struct o2nm_cluster *o2nm_single_cluster = NULL; +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"; @@ -97,17 +97,6 @@ const char *o2nm_get_hb_ctl_path(void) } 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; |