From: Ilya Dryomov <idryomov@gmail.com>
Date: Wed, 15 Aug 2018 13:53:09 +0000 (+0200)
Subject: krbd: change krbd_unmap_by_spec() to take "" instead of NULL
X-Git-Tag: v14.0.1~434^2~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=faa7a3ce9760e82a138c36408d57207ac551f00a;p=ceph.git

krbd: change krbd_unmap_by_spec() to take "" instead of NULL

krbd_map() and krbd_is_mapped() take "", krbd_unmap_by_spec() is the
odd one out.

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
---

diff --git a/src/krbd.cc b/src/krbd.cc
index 33c7fb5d76a2..3072045bc505 100644
--- a/src/krbd.cc
+++ b/src/krbd.cc
@@ -610,7 +610,7 @@ static int unmap_image(struct krbd_ctx *ctx, const char *pool,
   string id;
   int r;
 
-  if (!snap)
+  if (!*snap)
     snap = "-";
 
   r = spec_to_devno_and_krbd_id(ctx->udev, pool, image, snap, &devno, &id);
diff --git a/src/tools/rbd/action/Kernel.cc b/src/tools/rbd/action/Kernel.cc
index ef2c8f30ff08..91715e329fc0 100644
--- a/src/tools/rbd/action/Kernel.cc
+++ b/src/tools/rbd/action/Kernel.cc
@@ -498,8 +498,7 @@ int execute_unmap(const po::variables_map &vm,
   utils::init_context();
 
   r = do_kernel_unmap(device_name.empty() ? nullptr : device_name.c_str(),
-                      pool_name.c_str(), image_name.c_str(),
-                      snap_name.empty() ? nullptr : snap_name.c_str());
+                      pool_name.c_str(), image_name.c_str(), snap_name.c_str());
   if (r < 0) {
     std::cerr << "rbd: unmap failed: " << cpp_strerror(r) << std::endl;
     return r;