ocfs2_connection_private for holding DLM this_node information
PATCH 4/6 ocfs2_connection_private for holding DLM this_node information
Signed-off-by Goldwyn Rodrigues <[email protected]>
--- fs/ocfs2/dlmglue.c | 2 +- fs/ocfs2/stack_o2cb.c | 3 ++- fs/ocfs2/stack_user.c | 51 +++++++++++++++++++++++++++++++++++++++++++++------ fs/ocfs2/stackglue.c | 4 ++-- fs/ocfs2/stackglue.h | 4 ++-- 5 files changed, 52 insertions(+), 12 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 +45 -6
103 lines not on this page · raw message
fs/ocfs2/stackglue.c +2 -2
@@ -465,9 +465,9 @@ 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 +2 -2
@@ -157,7 +157,7 @@ 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 +267,7 @@ 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 *,unsigned int *node);struct ocfs2_lock_res ; int ocfs2_dlm_lock(struct ocfs2_cluster_connection *conn,
Signature · 5 lines
1.8.1.4 -- Goldwyn