ocfs2: Remove ->hangup() from stack glue operations.

The ->hangup() call was only used to execute ocfs2_hb_ctl. Now that
the generic stack glue code handles this, the underlying stack drivers
don't need to know about it.

Signed-off-by: Joel Becker <joel.becker@oracle.com>
Signed-off-by: Mark Fasheh <mfasheh@suse.com>

authored by Joel Becker and committed by Mark Fasheh 2c39450b 9f9a99f4

+6 -23
+1 -2
fs/ocfs2/stack_o2cb.c
··· 317 317 return rc; 318 318 } 319 319 320 - static int o2cb_cluster_disconnect(struct ocfs2_cluster_connection *conn, 321 - int hangup_pending) 320 + static int o2cb_cluster_disconnect(struct ocfs2_cluster_connection *conn) 322 321 { 323 322 struct dlm_ctxt *dlm = conn->cc_lockspace; 324 323 struct o2dlm_private *priv = conn->cc_private;
+1 -2
fs/ocfs2/stack_user.c
··· 816 816 return rc; 817 817 } 818 818 819 - static int user_cluster_disconnect(struct ocfs2_cluster_connection *conn, 820 - int hangup_pending) 819 + static int user_cluster_disconnect(struct ocfs2_cluster_connection *conn) 821 820 { 822 821 dlm_release_lockspace(conn->cc_lockspace, 2); 823 822 conn->cc_lockspace = NULL;
+1 -4
fs/ocfs2/stackglue.c
··· 352 352 353 353 BUG_ON(conn == NULL); 354 354 355 - ret = active_stack->sp_ops->disconnect(conn, hangup_pending); 355 + ret = active_stack->sp_ops->disconnect(conn); 356 356 357 357 /* XXX Should we free it anyway? */ 358 358 if (!ret) { ··· 405 405 { 406 406 BUG_ON(group == NULL); 407 407 BUG_ON(group[grouplen] != '\0'); 408 - 409 - if (active_stack->sp_ops->hangup) 410 - active_stack->sp_ops->hangup(group, grouplen); 411 408 412 409 ocfs2_leave_group(group); 413 410
+3 -15
fs/ocfs2/stackglue.h
··· 134 134 * be freed. Thus, a stack must not return from ->disconnect() 135 135 * until it will no longer reference the conn pointer. 136 136 * 137 - * If hangup_pending is zero, ocfs2_cluster_disconnect() will also 138 - * be dropping the reference on the module. 137 + * Once this call returns, the stack glue will be dropping this 138 + * connection's reference on the module. 139 139 */ 140 - int (*disconnect)(struct ocfs2_cluster_connection *conn, 141 - int hangup_pending); 142 - 143 - /* 144 - * ocfs2_cluster_hangup() exists for compatibility with older 145 - * ocfs2 tools. Only the classic stack really needs it. As such 146 - * ->hangup() is not required of all stacks. See the comment by 147 - * ocfs2_cluster_hangup() for more details. 148 - * 149 - * Note that ocfs2_cluster_hangup() can only be called if 150 - * hangup_pending was passed to ocfs2_cluster_disconnect(). 151 - */ 152 - void (*hangup)(const char *group, int grouplen); 140 + int (*disconnect)(struct ocfs2_cluster_connection *conn); 153 141 154 142 /* 155 143 * ->this_node() returns the cluster's unique identifier for the