diff options
author | Joel Becker <joel.becker@oracle.com> | 2008-01-30 18:38:24 -0500 |
---|---|---|
committer | Mark Fasheh <mfasheh@suse.com> | 2008-04-18 11:56:04 -0400 |
commit | 19fdb624dc8ccb663f6e48b3a3a3fa4e4e567fc1 (patch) | |
tree | b50e358686ca63789af4af07526e0d21f2806bfb /fs/ocfs2/stackglue.c | |
parent | 4670c46ded9a18268d1265417ff4ac72145a7917 (diff) |
ocfs2: Abstract out node number queries.
ocfs2 asks the cluster stack for the local node's node number for two
reasons; to fill the slot map and to print it. While the slot map isn't
necessary for userspace cluster stacks, the printing is very nice for
debugging. Thus we add ocfs2_cluster_this_node() as a generic API to get
this value. It is anticipated that the slot map will not be used under a
userspace cluster stack, so validity checks of the node num only need to
exist in the slot map code. Otherwise, it just gets used and printed as an
opaque value.
[ Fixed up some "int" versus "unsigned int" issues and made osb->node_num
truly opaque. --Mark ]
Signed-off-by: Joel Becker <joel.becker@oracle.com>
Signed-off-by: Mark Fasheh <mfasheh@suse.com>
Diffstat (limited to 'fs/ocfs2/stackglue.c')
-rw-r--r-- | fs/ocfs2/stackglue.c | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/fs/ocfs2/stackglue.c b/fs/ocfs2/stackglue.c index f6f309a08344..814686356cc6 100644 --- a/fs/ocfs2/stackglue.c +++ b/fs/ocfs2/stackglue.c | |||
@@ -25,6 +25,8 @@ | |||
25 | #include <linux/fs.h> | 25 | #include <linux/fs.h> |
26 | 26 | ||
27 | #include "cluster/masklog.h" | 27 | #include "cluster/masklog.h" |
28 | #include "cluster/nodemanager.h" | ||
29 | |||
28 | #include "stackglue.h" | 30 | #include "stackglue.h" |
29 | 31 | ||
30 | static struct ocfs2_locking_protocol *lproto; | 32 | static struct ocfs2_locking_protocol *lproto; |
@@ -371,6 +373,21 @@ int ocfs2_cluster_disconnect(struct ocfs2_cluster_connection *conn) | |||
371 | return 0; | 373 | return 0; |
372 | } | 374 | } |
373 | 375 | ||
376 | int ocfs2_cluster_this_node(unsigned int *node) | ||
377 | { | ||
378 | int node_num; | ||
379 | |||
380 | node_num = o2nm_this_node(); | ||
381 | if (node_num == O2NM_INVALID_NODE_NUM) | ||
382 | return -ENOENT; | ||
383 | |||
384 | if (node_num >= O2NM_MAX_NODES) | ||
385 | return -EOVERFLOW; | ||
386 | |||
387 | *node = node_num; | ||
388 | return 0; | ||
389 | } | ||
390 | |||
374 | void o2cb_get_stack(struct ocfs2_locking_protocol *proto) | 391 | void o2cb_get_stack(struct ocfs2_locking_protocol *proto) |
375 | { | 392 | { |
376 | BUG_ON(proto == NULL); | 393 | BUG_ON(proto == NULL); |