From 45f50cfd1336f8151de604f8c79fe9cf2752fbef Mon Sep 17 00:00:00 2001
From: Stefan Chivu <schivu@cloudbasesolutions.com>
Date: Mon, 3 Oct 2022 08:20:58 +0000
Subject: [PATCH] rbd: Added namespace optarg for rbd device unmap

When executing rbd device unmap, an explicit namespace optarg wasn't available

Fixes: https://tracker.ceph.com/issues/57765
Signed-off-by: Stefan Chivu <schivu@cloudbasesolutions.com>
(cherry picked from commit 51ba25c05c8ec93b26fc0b4fe6f3e5b685093244)
---
 src/test/cli/rbd/help.t        | 8 +++++---
 src/tools/rbd/action/Device.cc | 3 ++-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/test/cli/rbd/help.t b/src/test/cli/rbd/help.t
index 1eee504602c..bd8a1994903 100644
--- a/src/test/cli/rbd/help.t
+++ b/src/test/cli/rbd/help.t
@@ -670,19 +670,21 @@
   
   rbd help device unmap
   usage: rbd device unmap [--device-type <device-type>] [--pool <pool>] 
-                          [--image <image>] [--snap <snap>] [--options <options>] 
+                          [--namespace <namespace>] [--image <image>] 
+                          [--snap <snap>] [--options <options>] 
                           <image-or-snap-or-device-spec> 
   
   Unmap a rbd device.
   
   Positional arguments
     <image-or-snap-or-device-spec>  image, snapshot, or device specification
-                                    [<pool-name>/]<image-name>[@<snap-name>] or
-                                    <device-path>
+                                    [<pool-name>/[<namespace>/]]<image-name>[@<sna
+                                    p-name>] or <device-path>
   
   Optional arguments
     -t [ --device-type ] arg        device type [ggate, krbd (default), nbd]
     -p [ --pool ] arg               pool name
+    --namespace arg                 namespace name
     --image arg                     image name
     --snap arg                      snapshot name
     -o [ --options ] arg            device specific options
diff --git a/src/tools/rbd/action/Device.cc b/src/tools/rbd/action/Device.cc
index bfe60c273df..078f944cc6d 100644
--- a/src/tools/rbd/action/Device.cc
+++ b/src/tools/rbd/action/Device.cc
@@ -195,8 +195,9 @@ void get_unmap_arguments(po::options_description *positional,
   positional->add_options()
     ("image-or-snap-or-device-spec",
      "image, snapshot, or device specification\n"
-     "[<pool-name>/]<image-name>[@<snap-name>] or <device-path>");
+     "[<pool-name>/[<namespace>/]]<image-name>[@<snap-name>] or <device-path>");
   at::add_pool_option(options, at::ARGUMENT_MODIFIER_NONE);
+  at::add_namespace_option(options, at::ARGUMENT_MODIFIER_NONE);
   at::add_image_option(options, at::ARGUMENT_MODIFIER_NONE);
   at::add_snap_option(options, at::ARGUMENT_MODIFIER_NONE);
   add_device_specific_options(options);
-- 
2.47.3