From: xiexingguo <258156334@qq.com>
Date: Sat, 19 Dec 2015 04:21:00 +0000 (+0800)
Subject: librbd: string standard error number
X-Git-Tag: v10.0.3~169^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=4a4048b1e343c9da9155f430db3aefb5b11c2924;p=ceph.git

librbd: string standard error number

It's more human-readable.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
---

diff --git a/src/librbd/internal.cc b/src/librbd/internal.cc
index 57b7fa062d1..c2a2c73c8fd 100644
--- a/src/librbd/internal.cc
+++ b/src/librbd/internal.cc
@@ -1293,7 +1293,7 @@ int validate_pool(IoCtx &io_ctx, CephContext *cct) {
     remove_r = io_ctx.remove(header_oid);
     if (remove_r < 0) {
       lderr(cct) << "error cleaning up image header after creation failed: "
-		 << dendl;
+		 << cpp_strerror(remove_r) << dendl;
     }
   err_remove_from_dir:
     remove_r = cls_client::dir_remove_image(&io_ctx, RBD_DIRECTORY,
@@ -1610,7 +1610,7 @@ int validate_pool(IoCtx &io_ctx, CephContext *cct) {
 
     r = cls_client::metadata_list(&p_ioctx, p_imctx->header_oid, "", 0, &pairs);
     if (r < 0 && r != -EOPNOTSUPP && r != -EIO) {
-      lderr(cct) << "couldn't list metadata: " << r << dendl;
+      lderr(cct) << "couldn't list metadata: " << cpp_strerror(r) << dendl;
       goto err_remove_child;
     } else if (r == 0 && !pairs.empty()) {
       r = cls_client::metadata_set(&c_ioctx, c_imctx->header_oid, pairs);
@@ -2456,12 +2456,12 @@ int validate_pool(IoCtx &io_ctx, CephContext *cct) {
 
     r = cls_client::metadata_list(&src->md_ctx, src->header_oid, "", 0, &pairs);
     if (r < 0 && r != -EOPNOTSUPP && r != -EIO) {
-      lderr(cct) << "couldn't list metadata: " << r << dendl;
+      lderr(cct) << "couldn't list metadata: " << cpp_strerror(r) << dendl;
       return r;
     } else if (r == 0 && !pairs.empty()) {
       r = cls_client::metadata_set(&dest->md_ctx, dest->header_oid, pairs);
       if (r < 0) {
-        lderr(cct) << "couldn't set metadata: " << r << dendl;
+        lderr(cct) << "couldn't set metadata: " << cpp_strerror(r) << dendl;
         return r;
       }
     }