diff options
| -rw-r--r-- | fs/ocfs2/cluster/nodemanager.c | 13 | ||||
| -rw-r--r-- | fs/ocfs2/cluster/nodemanager.h | 14 |
2 files changed, 15 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 @@ | |||
| 35 | /* for now we operate under the assertion that there can be only one | 35 | /* for now we operate under the assertion that there can be only one |
| 36 | * cluster active at a time. Changing this will require trickling | 36 | * cluster active at a time. Changing this will require trickling |
| 37 | * cluster references throughout where nodes are looked up */ | 37 | * cluster references throughout where nodes are looked up */ |
| 38 | static struct o2nm_cluster *o2nm_single_cluster = NULL; | 38 | struct o2nm_cluster *o2nm_single_cluster = NULL; |
| 39 | 39 | ||
| 40 | #define OCFS2_MAX_HB_CTL_PATH 256 | 40 | #define OCFS2_MAX_HB_CTL_PATH 256 |
| 41 | static char ocfs2_hb_ctl_path[OCFS2_MAX_HB_CTL_PATH] = "/sbin/ocfs2_hb_ctl"; | 41 | 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) | |||
| 97 | } | 97 | } |
| 98 | EXPORT_SYMBOL_GPL(o2nm_get_hb_ctl_path); | 98 | EXPORT_SYMBOL_GPL(o2nm_get_hb_ctl_path); |
| 99 | 99 | ||
| 100 | struct o2nm_cluster { | ||
| 101 | struct config_group cl_group; | ||
| 102 | unsigned cl_has_local:1; | ||
| 103 | u8 cl_local_node; | ||
| 104 | rwlock_t cl_nodes_lock; | ||
| 105 | struct o2nm_node *cl_nodes[O2NM_MAX_NODES]; | ||
| 106 | struct rb_root cl_node_ip_tree; | ||
| 107 | /* this bitmap is part of a hack for disk bitmap.. will go eventually. - zab */ | ||
| 108 | unsigned long cl_nodes_bitmap[BITS_TO_LONGS(O2NM_MAX_NODES)]; | ||
| 109 | }; | ||
| 110 | |||
| 111 | struct o2nm_node *o2nm_get_node_by_num(u8 node_num) | 100 | struct o2nm_node *o2nm_get_node_by_num(u8 node_num) |
| 112 | { | 101 | { |
| 113 | struct o2nm_node *node = NULL; | 102 | struct o2nm_node *node = NULL; |
diff --git a/fs/ocfs2/cluster/nodemanager.h b/fs/ocfs2/cluster/nodemanager.h index fce8033c310f..b571cda9fbb7 100644 --- a/fs/ocfs2/cluster/nodemanager.h +++ b/fs/ocfs2/cluster/nodemanager.h | |||
| @@ -53,6 +53,20 @@ struct o2nm_node { | |||
| 53 | unsigned long nd_set_attributes; | 53 | unsigned long nd_set_attributes; |
| 54 | }; | 54 | }; |
| 55 | 55 | ||
| 56 | struct o2nm_cluster { | ||
| 57 | struct config_group cl_group; | ||
| 58 | unsigned cl_has_local:1; | ||
| 59 | u8 cl_local_node; | ||
| 60 | rwlock_t cl_nodes_lock; | ||
| 61 | struct o2nm_node *cl_nodes[O2NM_MAX_NODES]; | ||
| 62 | struct rb_root cl_node_ip_tree; | ||
| 63 | |||
| 64 | /* this bitmap is part of a hack for disk bitmap.. will go eventually. - zab */ | ||
| 65 | unsigned long cl_nodes_bitmap[BITS_TO_LONGS(O2NM_MAX_NODES)]; | ||
| 66 | }; | ||
| 67 | |||
| 68 | extern struct o2nm_cluster *o2nm_single_cluster; | ||
| 69 | |||
| 56 | u8 o2nm_this_node(void); | 70 | u8 o2nm_this_node(void); |
| 57 | 71 | ||
| 58 | int o2nm_configured_node_map(unsigned long *map, unsigned bytes); | 72 | int o2nm_configured_node_map(unsigned long *map, unsigned bytes); |
