From 79127642eb66bd878a1bb6fbf402d695af5bac63 Mon Sep 17 00:00:00 2001 From: Stefan Chivu Date: Tue, 4 Oct 2022 14:02:14 +0000 Subject: [PATCH] rbd: Removed device_name argument from wnbd unmap Right now, rbd-wnbd doesn't actually use disk path identifiers such as "/dev/*" or "\\.\PhysicalDrive*". So instead of accepting two arguments that are basically handled more or less the same, we're dropping the device_name argument and sticking to the image spec. Signed-off-by: Stefan Chivu --- src/tools/rbd/action/Wnbd.cc | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/src/tools/rbd/action/Wnbd.cc b/src/tools/rbd/action/Wnbd.cc index 180676d2acef6..85d2c7057bfab 100644 --- a/src/tools/rbd/action/Wnbd.cc +++ b/src/tools/rbd/action/Wnbd.cc @@ -126,26 +126,17 @@ int execute_unmap(const po::variables_map &vm, std::cerr << "rbd: wnbd is only supported on Windows" << std::endl; return -EOPNOTSUPP; #else - std::string device_name = utils::get_positional_argument(vm, 0); - std::string image_name; - if (device_name.empty()) { - int r = utils::get_image_or_snap_spec(vm, &image_name); - if (r < 0) { - return r; - } - } - if (device_name.empty() && image_name.empty()) { - std::cerr << "rbd: unmap requires either image name or device path" - << std::endl; - return -EINVAL; + int r = utils::get_image_or_snap_spec(vm, &image_name); + if (r < 0) { + return r; } std::vector args; args.push_back("unmap"); - args.push_back(device_name.empty() ? image_name : device_name); + args.push_back(image_name); if (vm.count("options")) { utils::append_options_as_args(vm["options"].as>(), -- 2.39.5