From: John Spray <jspray@redhat.com>
Date: Wed, 21 Jun 2017 11:30:53 +0000 (-0400)
Subject: Merge pull request #15715 from jcsp/wip-jt-rmapply
X-Git-Tag: v12.1.0~32
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=623e8b2a139cd4f9b9b3c158645a5d5b4df9ee05;p=ceph.git

Merge pull request #15715 from jcsp/wip-jt-rmapply

tools/cephfs: remove `apply` mode of cephfs-journal-tool

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
---

623e8b2a139cd4f9b9b3c158645a5d5b4df9ee05
diff --cc src/tools/cephfs/JournalTool.cc
index bc748ae43a30,81efb08e0ba5..057e79cb86bf
--- a/src/tools/cephfs/JournalTool.cc
+++ b/src/tools/cephfs/JournalTool.cc
@@@ -56,18 -56,15 +56,18 @@@ void JournalTool::usage(
      << "      --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"
+     << "    <effect>: [get|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();
  }