From 7f32a3de7882f21ca0f241e7cc579fcf23d09a86 Mon Sep 17 00:00:00 2001
From: s09816 <shi.lu@h3c.com>
Date: Thu, 13 Aug 2015 23:24:41 -0400
Subject: [PATCH] rbd:modify the log of purging snaps so that it is more
 appropriate.

Signed-off-by: s09816 <shi.lu@h3c.com>
---
 src/rbd.cc | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
 mode change 100644 => 100755 src/rbd.cc

diff --git a/src/rbd.cc b/src/rbd.cc
old mode 100644
new mode 100755
index 67bdd5800af..83e551ac57b
--- a/src/rbd.cc
+++ b/src/rbd.cc
@@ -787,7 +787,7 @@ static int do_purge_snaps(librbd::Image& image)
         return r;
       } else if (is_protected == true) {
         pc.fail();
-        cerr << "\r" <<snaps[i].name.c_str()<< " is a protected snap."<< std::endl;
+        cerr << "\r" << "rbd: snapshot '" <<snaps[i].name.c_str()<< "' is protected from removal." << std::endl;
         return -EBUSY;
       }
     }
@@ -3847,7 +3847,9 @@ if (!set_conf_param(v, p1, p2, p3)) { \
   case OPT_SNAP_PURGE:
     r = do_purge_snaps(image);
     if (r < 0) {
-      cerr << "rbd: removing snaps failed: " << cpp_strerror(-r) << std::endl;
+      if (r != -EBUSY) {
+        cerr << "rbd: removing snaps failed: " << cpp_strerror(-r) << std::endl;
+      }
       return -r;
     }
     break;