Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2c39450b authored by Joel Becker's avatar Joel Becker Committed by Mark Fasheh
Browse files

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: default avatarJoel Becker <joel.becker@oracle.com>
Signed-off-by: default avatarMark Fasheh <mfasheh@suse.com>
parent 9f9a99f4

fs/ocfs2/stack_o2cb.c

+1 −2
Original line number Diff line number Diff line
@@ -317,8 +317,7 @@ static int o2cb_cluster_connect(struct ocfs2_cluster_connection *conn) 
	return rc;

}



static int o2cb_cluster_disconnect(struct ocfs2_cluster_connection *conn,

				   int hangup_pending)

static int o2cb_cluster_disconnect(struct ocfs2_cluster_connection *conn)

{

	struct dlm_ctxt *dlm = conn->cc_lockspace;

	struct o2dlm_private *priv = conn->cc_private;

fs/ocfs2/stack_user.c

+1 −2
Original line number Diff line number Diff line
@@ -816,8 +816,7 @@ static int user_cluster_connect(struct ocfs2_cluster_connection *conn) 
	return rc;

}



static int user_cluster_disconnect(struct ocfs2_cluster_connection *conn,

				   int hangup_pending)

static int user_cluster_disconnect(struct ocfs2_cluster_connection *conn)

{

	dlm_release_lockspace(conn->cc_lockspace, 2);

	conn->cc_lockspace = NULL;

fs/ocfs2/stackglue.c

+1 −4
Original line number Diff line number Diff line
@@ -352,7 +352,7 @@ int ocfs2_cluster_disconnect(struct ocfs2_cluster_connection *conn, 


	BUG_ON(conn == NULL);



	ret = active_stack->sp_ops->disconnect(conn, hangup_pending);

	ret = active_stack->sp_ops->disconnect(conn);



	/* XXX Should we free it anyway? */

	if (!ret) {
@@ -406,9 +406,6 @@ void ocfs2_cluster_hangup(const char *group, int grouplen) 
	BUG_ON(group == NULL);

	BUG_ON(group[grouplen] != '\0');



	if (active_stack->sp_ops->hangup)

		active_stack->sp_ops->hangup(group, grouplen);



	ocfs2_leave_group(group);



	/* cluster_disconnect() was called with hangup_pending==1 */

fs/ocfs2/stackglue.h

+3 −15
Original line number Diff line number Diff line
@@ -134,22 +134,10 @@ struct ocfs2_stack_operations { 
	 * be freed.  Thus, a stack must not return from ->disconnect()

	 * until it will no longer reference the conn pointer.

	 *

	 * If hangup_pending is zero, ocfs2_cluster_disconnect() will also

	 * be dropping the reference on the module.

	 * Once this call returns, the stack glue will be dropping this

	 * connection's reference on the module.

	 */

	int (*disconnect)(struct ocfs2_cluster_connection *conn,

			  int hangup_pending);



	/*

	 * ocfs2_cluster_hangup() exists for compatibility with older

	 * ocfs2 tools.  Only the classic stack really needs it.  As such

	 * ->hangup() is not required of all stacks.  See the comment by

	 * ocfs2_cluster_hangup() for more details.

	 *

	 * Note that ocfs2_cluster_hangup() can only be called if

	 * hangup_pending was passed to ocfs2_cluster_disconnect().

	 */

	void (*hangup)(const char *group, int grouplen);

	int (*disconnect)(struct ocfs2_cluster_connection *conn);



	/*

	 * ->this_node() returns the cluster's unique identifier for the