rbd: fix up terminology in help texts

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
(cherry picked from commit ba8f9ee791d55c4cf25ad751213ea6ba770b7434)

diff --git a/src/test/cli/rbd/help.t b/src/test/cli/rbd/help.t
index 4848370feb4a7e239e83c737d7103891681ce53d..10cee52353f03133bf730b2ca5d35e2ddeb69d26 100644 (file)
--- a/src/test/cli/rbd/help.t
+++ b/src/test/cli/rbd/help.t
@@ -738,8 +738,8 @@
     -p [ --pool ] arg     pool name
     --image arg           image name
     --snap arg            snapshot name
-    -o [ --options ] arg  mapping options
-    --read-only           mount read-only
+    -o [ --options ] arg  map options
+    --read-only           map read-only
   
   rbd help merge-diff
   usage: rbd merge-diff [--path <path>] [--no-progress] 

diff --git a/src/tools/rbd/action/Kernel.cc b/src/tools/rbd/action/Kernel.cc
index a488b9beec274db10b8c70c4f9287312ac370c34..0777f211cde33c6bcb72764ac571016e2ac408f7 100644 (file)
--- a/src/tools/rbd/action/Kernel.cc
+++ b/src/tools/rbd/action/Kernel.cc
@@ -281,8 +281,8 @@ void get_map_arguments(po::options_description *positional,
   at::add_image_or_snap_spec_options(positional, options,
                                      at::ARGUMENT_MODIFIER_NONE);
   options->add_options()
-    ("options,o", po::value<std::string>(), "mapping options")
-    ("read-only", po::bool_switch(), "mount read-only");
+    ("options,o", po::value<std::string>(), "map options")
+    ("read-only", po::bool_switch(), "map read-only");
 }
 
 int execute_map(const po::variables_map &vm) {