summaryrefslogtreecommitdiffstats
path: root/fs/ocfs2/stackglue.c
diff options
context:
space:
mode:
authorJoel Becker <joel.becker@oracle.com>2008-05-31 00:58:26 +0200
committerMark Fasheh <mfasheh@suse.com>2008-06-16 19:46:52 +0200
commit2c39450b39880e162b3eb339672314101f58ee1a (patch)
tree48e99a531dd5263d7a84cf23492373f45fbdea6e /fs/ocfs2/stackglue.c
parentocfs2: Move the call of ocfs2_hb_ctl into the stack glue. (diff)
downloadlinux-2c39450b39880e162b3eb339672314101f58ee1a.tar.xz
linux-2c39450b39880e162b3eb339672314101f58ee1a.zip
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>
Diffstat (limited to 'fs/ocfs2/stackglue.c')
-rw-r--r--fs/ocfs2/stackglue.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/fs/ocfs2/stackglue.c b/fs/ocfs2/stackglue.c
index 5f78ff4c76c7..10e149ae5e3a 100644
--- a/fs/ocfs2/stackglue.c
+++ b/fs/ocfs2/stackglue.c
@@ -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 */