From 80612a566e0a6431b9b13bcde2838e44457924a5 Mon Sep 17 00:00:00 2001
From: John Spray <john.spray@redhat.com>
Date: Sun, 11 Jun 2017 08:22:20 -0400
Subject: [PATCH] tools/cephfs: fix cephfs-journal-tool --help

The --alternate-pool option was in the wrong place.

This format is not beautiful, but I think it's accurate
in terms of where the option should sit to get parsed
correctly?

Signed-off-by: John Spray <john.spray@redhat.com>
---
 src/tools/cephfs/JournalTool.cc | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/tools/cephfs/JournalTool.cc b/src/tools/cephfs/JournalTool.cc
index 0f3b15752501..bc748ae43a30 100644
--- a/src/tools/cephfs/JournalTool.cc
+++ b/src/tools/cephfs/JournalTool.cc
@@ -49,22 +49,25 @@ void JournalTool::usage()
     << "      export <path>\n"
     << "      reset [--force]\n"
     << "  cephfs-journal-tool [options] header <get|set <field> <value>\n"
-    << "  cephfs-journal-tool [options] event <effect> <selector> <output>\n"
+    << "  cephfs-journal-tool [options] event <effect> <selector> <output> [special options]\n"
     << "    <selector>:\n"
     << "      --range=<start>..<end>\n"
     << "      --path=<substring>\n"
     << "      --inode=<integer>\n"
     << "      --type=<UPDATE|OPEN|SESSION...><\n"
     << "      --frag=<ino>.<frag> [--dname=<dentry string>]\n"
-    << "      --alternate-pool=pool-name\n"
     << "      --client=<session id integer>\n"
     << "    <effect>: [get|apply|recover_dentries|splice]\n"
     << "    <output>: [summary|list|binary|json] [--path <path>]\n"
     << "\n"
-    << "Options:\n"
+    << "General options:\n"
     << "  --rank=filesystem:mds-rank  Journal rank (required if multiple\n"
     << "                              file systems, default is rank 0 on\n"
-    << "                              the only filesystem otherwise.\n";
+    << "                              the only filesystem otherwise.\n"
+    << "\n"
+    << "Special options\n"
+    << "  --alternate-pool <name>     Alternative metadata pool to target\n"
+    << "                              when using recover_dentries.\n";
 
   generic_client_usage();
 }
-- 
2.47.3