aboutsummaryrefslogtreecommitdiffstats
path: root/fs/ocfs2/stackglue.c
diff options
context:
space:
mode:
authorJoel Becker <joel.becker@oracle.com>2010-01-29 18:46:23 -0500
committerJoel Becker <joel.becker@oracle.com>2010-02-26 18:41:16 -0500
commit110946c8fb23c1e1e23312afed0977ad4aa37c95 (patch)
treea71cc2b0f7819d80426ed0a445f42d4558df99fb /fs/ocfs2/stackglue.c
parentc0e4133851ed94c73ee3d34a2f2a245fcd0a60a1 (diff)
ocfs2: Hang the locking proto on the cluster conn and use it in asts.
With the ocfs2_cluster_connection hanging off of the ocfs2_dlm_lksb, we have access to it in the ast and bast wrapper functions. Attach the ocfs2_locking_protocol to the conn. Now, instead of refering to a static variable for ast/bast pointers, the wrappers can look at the connection. This means different connections can have different ast/bast pointers, and it reduces the need for the static pointer. Signed-off-by: Joel Becker <joel.becker@oracle.com>
Diffstat (limited to 'fs/ocfs2/stackglue.c')
-rw-r--r--fs/ocfs2/stackglue.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/ocfs2/stackglue.c b/fs/ocfs2/stackglue.c
index 8ef9a574315e..010ecabbdeb5 100644
--- a/fs/ocfs2/stackglue.c
+++ b/fs/ocfs2/stackglue.c
@@ -343,6 +343,7 @@ int ocfs2_cluster_connect(const char *stack_name,
343 new_conn->cc_recovery_handler = recovery_handler; 343 new_conn->cc_recovery_handler = recovery_handler;
344 new_conn->cc_recovery_data = recovery_data; 344 new_conn->cc_recovery_data = recovery_data;
345 345
346 new_conn->cc_proto = lproto;
346 /* Start the new connection at our maximum compatibility level */ 347 /* Start the new connection at our maximum compatibility level */
347 new_conn->cc_version = lproto->lp_max_version; 348 new_conn->cc_version = lproto->lp_max_version;
348 349