forked from pool/ocfs2-tools
ab40e465fc
- Make mount.ocfs2 load modules and write cluster_stack: + 0007-mount.ocfs2-performs-module-loading-cluster_stack-se.patch - Mark o2cb.ocf as obsolete. Anyone using o2cb.ocf will get an info message stating so. - The nocontrold effort (added nocontrold patches and disabled corosync-2.3 controld compatibility patches): + 0001-libo2cb-Remove-controld-actions-from-group-join-leav.patch + 0002-libo2cb-Remove-rest-of-controld-functions.patch + 0003-Get-cluster-name-from-corosync-cmap.patch + 0004-Remove-controld-structures-from-debugfs.ocfs2.patch + 0005-Check-for-DLM-kernel-version-in-user_begin_group_joi.patch + 0006-Add-cmap-and-dlm-libraries-in-the-tools.patch - 0001-Remove-pacemaker-ais-stuff.patch - 0002-Add-corosync-cfg-to-get-configuration-information.patch - 0003-Remove-daemon-protocol-versions-and-consolidate-fs-v.patch - 0005-Add-cluster_name-and-stack-name.patch - libocfs2-Change-asserts-to-error.patch: Return control to fsck.ocfs2 instead of erring OBS-URL: https://build.opensuse.org/request/show/196156 OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/ocfs2-tools?expand=0&rev=64
65 lines
1.5 KiB
Diff
65 lines
1.5 KiB
Diff
From 394a3e7d2758331ba8aa6fc38957611d2447a73d Mon Sep 17 00:00:00 2001
|
|
From: Goldwyn Rodrigues <rgoldwyn@suse.com>
|
|
Date: Mon, 19 Aug 2013 19:15:53 -0500
|
|
Subject: [PATCH 4/7] Remove controld structures from debugfs.ocfs2
|
|
|
|
---
|
|
debugfs.ocfs2/commands.c | 34 ----------------------------------
|
|
1 file changed, 34 deletions(-)
|
|
|
|
diff --git a/debugfs.ocfs2/commands.c b/debugfs.ocfs2/commands.c
|
|
index e0b228a..c1c7589 100644
|
|
--- a/debugfs.ocfs2/commands.c
|
|
+++ b/debugfs.ocfs2/commands.c
|
|
@@ -108,11 +108,6 @@ static struct command commands[] = {
|
|
"close",
|
|
"Close a device",
|
|
},
|
|
- { "controld",
|
|
- do_controld,
|
|
- "controld dump",
|
|
- "Obtain information from ocfs2_controld",
|
|
- },
|
|
{ "curdev",
|
|
do_curdev,
|
|
"curdev",
|
|
@@ -894,35 +889,6 @@ static void do_lcd(char **args)
|
|
return ;
|
|
}
|
|
|
|
-static void do_controld_dump(char **args)
|
|
-{
|
|
- FILE *out;
|
|
- errcode_t ret;
|
|
- char *debug_buffer;
|
|
-
|
|
- ret = o2cb_control_daemon_debug(&debug_buffer);
|
|
- if (ret) {
|
|
- com_err(args[0], ret, "while obtaining the debug buffer");
|
|
- return;
|
|
- }
|
|
-
|
|
- out = open_pager(gbls.interactive);
|
|
- fprintf(out, "%s", debug_buffer);
|
|
- close_pager(out);
|
|
- free(debug_buffer);
|
|
-}
|
|
-
|
|
-static void do_controld(char **args)
|
|
-{
|
|
- if (!args[1])
|
|
- fprintf(stderr, "%s: Operation required\n", args[0]);
|
|
- else if (!strcmp(args[1], "dump"))
|
|
- do_controld_dump(args);
|
|
- else
|
|
- fprintf(stderr, "%s: Invalid operation: \"%s\"\n",
|
|
- args[0], args[1]);
|
|
-}
|
|
-
|
|
static void do_curdev(char **args)
|
|
{
|
|
printf("%s\n", gbls.device ? gbls.device : "No device");
|
|
--
|
|
1.8.1.4
|
|
|