diff options
author | Joel Becker <joel.becker@oracle.com> | 2008-05-30 18:58:26 -0400 |
---|---|---|
committer | Mark Fasheh <mfasheh@suse.com> | 2008-06-16 13:46:52 -0400 |
commit | 2c39450b39880e162b3eb339672314101f58ee1a (patch) | |
tree | 48e99a531dd5263d7a84cf23492373f45fbdea6e /fs/ocfs2/stackglue.c | |
parent | 9f9a99f4eccc64650e932090cff0ebd07b81e334 (diff) |
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.c | 5 |
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, | |||
352 | 352 | ||
353 | BUG_ON(conn == NULL); | 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 | /* XXX Should we free it anyway? */ | 357 | /* XXX Should we free it anyway? */ |
358 | if (!ret) { | 358 | if (!ret) { |
@@ -406,9 +406,6 @@ void ocfs2_cluster_hangup(const char *group, int grouplen) | |||
406 | BUG_ON(group == NULL); | 406 | BUG_ON(group == NULL); |
407 | BUG_ON(group[grouplen] != '\0'); | 407 | BUG_ON(group[grouplen] != '\0'); |
408 | 408 | ||
409 | if (active_stack->sp_ops->hangup) | ||
410 | active_stack->sp_ops->hangup(group, grouplen); | ||
411 | |||
412 | ocfs2_leave_group(group); | 409 | ocfs2_leave_group(group); |
413 | 410 | ||
414 | /* cluster_disconnect() was called with hangup_pending==1 */ | 411 | /* cluster_disconnect() was called with hangup_pending==1 */ |