Pass ocfs2_cluster_connection to ocfs2_this_node
PATCH 4/6 Pass ocfs2_cluster_connection to ocfs2_this_node
This is done to differentiate between using and not using controld and use the connection information accordingly.
We need to be backward compatible. So, we use a new enum ocfs2_connection_type to identify when controld is used and when it is not.
Signed-off-by Goldwyn Rodrigues <[email protected]>
--- fs/ocfs2/dlmglue.c | 2 +- fs/ocfs2/stack_o2cb.c | 3 ++- fs/ocfs2/stack_user.c | 17 +++++++++++++++-- fs/ocfs2/stackglue.c | 5 +++-- fs/ocfs2/stackglue.h | 6 ++++-- 5 files changed, 25 insertions(+), 8 deletions(-)
fs/ocfs2/dlmglue.c +1 -1
@@ -3007,7 +3007,7 @@ int ocfs2_dlm_init(struct ocfs2_super *osb) goto bail; } - status =ocfs2_cluster_this_node (&osb->node_num); + status =ocfs2_cluster_this_node (conn, &osb->node_num);if (status <0 ) {mlog_errno (status); mlog(ML_ERROR,
fs/ocfs2/stack_o2cb.c +2 -1
@@ -398,7 +398,8 @@ static int o2cb_cluster_disconnect(struct ocfs2_cluster_connection *conn)return 0 ; } -static int o2cb_cluster_this_node (unsigned int *node) +static int o2cb_cluster_this_node (struct ocfs2_cluster_connection *conn, +unsigned int *node) {int node_num;
fs/ocfs2/stack_user.c +15 -2
@@ -103,6 +103,11 @@#define OCFS2_CONTROL_MESSAGE_VERNUM_LEN 2#define OCFS2_CONTROL_MESSAGE_NODENUM_LEN 8 +enum ocfs2_connection_type { +WITH_CONTROLD , +NO_CONTROLD +}; +/* * ocfs2_live_connection is refcounted because the filesystem and * miscdevice sides can detach in different order. Let's just be safe.
@@ -110,6 +115,7 @@struct ocfs2_live_connection {struct list_head oc_list;struct ocfs2_cluster_connection *oc_conn; +enum ocfs2_connection_type oc_type;atomic_t oc_this_node;int oc_our_slot; };
@@ -840,6 +846,8 @@ static int user_cluster_connect(struct ocfs2_cluster_connection *conn) goto out; } + lc->oc_type =WITH_CONTROLD ; + rc =ocfs2_live_connection_new (conn, lc);if (rc) goto out;
@@ -886,11 +894,16 @@ static int user_cluster_disconnect(struct ocfs2_cluster_connection *conn)return 0 ; } -static int user_cluster_this_node (unsigned int *this_node) +static int user_cluster_this_node (struct ocfs2_cluster_connection *conn, +unsigned int *this_node) {int rc; +struct ocfs2_live_connection *lc = conn->cc_private; - rc =ocfs2_control_get_this_node (); +if (lc->oc_type ==WITH_CONTROLD ) + rc =ocfs2_control_get_this_node (); +else + rc = -EINVAL ;if (rc <0 )return rc;
fs/ocfs2/stackglue.c +3 -2
@@ -465,9 +465,10 @@ void ocfs2_cluster_hangup(const char *group, int grouplen) }EXPORT_SYMBOL_GPL (ocfs2_cluster_hangup); -int ocfs2_cluster_this_node (unsigned int *node) +int ocfs2_cluster_this_node (struct ocfs2_cluster_connection *conn, +unsigned int *node) { -return active_stack->sp_ops->this_node (node); +return active_stack->sp_ops->this_node (conn, node); }EXPORT_SYMBOL_GPL (ocfs2_cluster_this_node);
fs/ocfs2/stackglue.h +4 -2
@@ -157,7 +157,8 @@ struct ocfs2_stack_operations {* ->this_node() returns the cluster's unique identifier for the * local node. */ -int (*this_node)(unsigned int *node); +int (*this_node)(struct ocfs2_cluster_connection *conn, +unsigned int *node);/* * Call the underlying dlm lock function. The ->dlm_lock()
@@ -267,7 +268,8 @@ int ocfs2_cluster_connect_agnostic(const char *group,int ocfs2_cluster_disconnect (struct ocfs2_cluster_connection *conn,int hangup_pending);void ocfs2_cluster_hangup (const char *group,int grouplen); -int ocfs2_cluster_this_node (unsigned int *node); +int ocfs2_cluster_this_node (struct ocfs2_cluster_connection *conn, +unsigned int *node);struct ocfs2_lock_res ; int ocfs2_dlm_lock(struct ocfs2_cluster_connection *conn,
Signature · 5 lines
1.8.1.4 -- Goldwyn
PATCH 4/6 Pass ocfs2_cluster_connection to ocfs2_this_node
Quoted 6 lines · Goldwyn Rodrigues
This is done to differentiate between using and not using controld and use the connection information accordingly.
We need to be backward compatible. So, we use a new enumocfs2_connection_typeto identify when controld is used and when it is not.
Quoted 9 lines
Signed-off-by Goldwyn Rodrigues <[email protected]>--- fs/ocfs2/dlmglue.c | 2 +- fs/ocfs2/stack_o2cb.c | 3 ++- fs/ocfs2/stack_user.c | 17 +++++++++++++++-- fs/ocfs2/stackglue.c | 5 +++-- fs/ocfs2/stackglue.h | 6 ++++-- 5 files changed, 25 insertions(+), 8 deletions(-)
This patch seems reasonable to me:
Reviewed-by Mark Fasheh <[email protected]>
--Mark
--
Mark Fasheh