lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Joel Becker
2008-05-30 15:58:26 -07:00
committed by Mark Fasheh
parent 9f9a99f4ec
commit 2c39450b39
4 changed files with 6 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
fs/ocfs2/stack_o2cb.c
View File

@@ -317,8 +317,7 @@ out:
return rc; return rc;
} }
static int o2cb_cluster_disconnect(struct ocfs2_cluster_connection *conn, static int o2cb_cluster_disconnect(struct ocfs2_cluster_connection *conn)
int hangup_pending)
{ {
struct dlm_ctxt *dlm = conn->cc_lockspace; struct dlm_ctxt *dlm = conn->cc_lockspace;
struct o2dlm_private *priv = conn->cc_private; struct o2dlm_private *priv = conn->cc_private;

3
fs/ocfs2/stack_user.c
View File

@@ -816,8 +816,7 @@ out:
return rc; return rc;
} }
static int user_cluster_disconnect(struct ocfs2_cluster_connection *conn, static int user_cluster_disconnect(struct ocfs2_cluster_connection *conn)
int hangup_pending)
{ {
dlm_release_lockspace(conn->cc_lockspace, 2); dlm_release_lockspace(conn->cc_lockspace, 2);
conn->cc_lockspace = NULL; conn->cc_lockspace = NULL;

5
fs/ocfs2/stackglue.c
View File

@@ -352,7 +352,7 @@ int ocfs2_cluster_disconnect(struct ocfs2_cluster_connection *conn,
BUG_ON(conn == NULL); 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? */ /* XXX Should we free it anyway? */
if (!ret) { if (!ret) {
@@ -406,9 +406,6 @@ void ocfs2_cluster_hangup(const char *group, int grouplen)
BUG_ON(group == NULL); BUG_ON(group == NULL);
BUG_ON(group[grouplen] != '\0'); BUG_ON(group[grouplen] != '\0');
if (active_stack->sp_ops->hangup)
active_stack->sp_ops->hangup(group, grouplen);
ocfs2_leave_group(group); ocfs2_leave_group(group);
/* cluster_disconnect() was called with hangup_pending==1 */ /* cluster_disconnect() was called with hangup_pending==1 */

18
fs/ocfs2/stackglue.h
View File

@@ -134,22 +134,10 @@ struct ocfs2_stack_operations {
* be freed. Thus, a stack must not return from ->disconnect() * be freed. Thus, a stack must not return from ->disconnect()
* until it will no longer reference the conn pointer. * until it will no longer reference the conn pointer.
* *
* If hangup_pending is zero, ocfs2_cluster_disconnect() will also * Once this call returns, the stack glue will be dropping this
* be dropping the reference on the module. * connection's reference on the module.
*/ */
int (*disconnect)(struct ocfs2_cluster_connection *conn, 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);
/* /*
* ->this_node() returns the cluster's unique identifier for the * ->this_node() returns the cluster's unique identifier for the