From: Jeff Mahoney <je...@suse.com>

In preparation to use cmd_struct as the command entry point, we need
to split out the 'filesystem balance' handling to not call cmd_balance
directly.  The reason is that the flags that indicate a command is
hidden are a part of cmd_struct and so we can use a cmd_struct as a
direct alias in another command group and ALSO have it be hidden
without declaring another cmd_struct.

This change has no immediate impact since cmd_balance will still
use its usage information directly from cmds-balance.c.  It will
take effect once we start passing cmd_structs around for usage
information.

Signed-off-by: Jeff Mahoney <je...@suse.com>
---
 cmds-filesystem.c | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/cmds-filesystem.c b/cmds-filesystem.c
index 467aff11..62112705 100644
--- a/cmds-filesystem.c
+++ b/cmds-filesystem.c
@@ -1184,6 +1184,18 @@ static int cmd_filesystem_label(int argc, char **argv)
        }
 }
 
+static const char * const cmd_filesystem_balance_usage[] = {
+       "btrfs filesystem balance [args...] (alias of \"btrfs balance\")",
+       "Please see \"btrfs balance --help\" for more information.",
+       NULL
+};
+
+/* Compatible old "btrfs filesystem balance" command */
+static int cmd_filesystem_balance(int argc, char **argv)
+{
+       return cmd_balance(argc, argv);
+}
+
 static const char filesystem_cmd_group_info[] =
 "overall filesystem tasks and information";
 
@@ -1197,8 +1209,9 @@ const struct cmd_group filesystem_cmd_group = {
                        0 },
                { "defragment", cmd_filesystem_defrag,
                        cmd_filesystem_defrag_usage, NULL, 0 },
-               { "balance", cmd_balance, NULL, &balance_cmd_group,
-                       CMD_HIDDEN },
+               { "balance", cmd_filesystem_balance,
+                  cmd_filesystem_balance_usage, &balance_cmd_group,
+                  CMD_HIDDEN },
                { "resize", cmd_filesystem_resize, cmd_filesystem_resize_usage,
                        NULL, 0 },
                { "label", cmd_filesystem_label, cmd_filesystem_label_usage,
-- 
2.12.3

--
To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to