From 71d30ca9637b7a2417fcc15569906fc6f1e57cc7 Mon Sep 17 00:00:00 2001 From: Jason Dillaman Date: Mon, 20 Nov 2017 11:03:17 -0500 Subject: [PATCH] rbd: disk usage on empty pool no longer returns an error message Fixes: http://tracker.ceph.com/issues/22200 Signed-off-by: Jason Dillaman (cherry picked from commit f4528122d66d1bc7dd07a64d1af7b65fe53f7b0b) --- src/tools/rbd/action/DiskUsage.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/tools/rbd/action/DiskUsage.cc b/src/tools/rbd/action/DiskUsage.cc index 3a38a052fb3d2..9dde06e113a50 100644 --- a/src/tools/rbd/action/DiskUsage.cc +++ b/src/tools/rbd/action/DiskUsage.cc @@ -208,7 +208,7 @@ static int do_disk_usage(librbd::RBD &rbd, librados::IoCtx &io_ctx, ++count; } } - if (!found) { + if (imgname != nullptr && !found) { std::cerr << "specified image " << imgname << " is not found." << std::endl; return -ENOENT; } -- 2.39.5