From: songweibin <song.weibin@zte.com.cn>
Date: Tue, 5 Dec 2017 04:14:21 +0000 (+0800)
Subject: rbd: comment/msg cleanup
X-Git-Tag: v13.0.2~850^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F19280%2Fhead;p=ceph.git

rbd: comment/msg cleanup

Signed-off-by: songweibin <song.weibin@zte.com.cn>
---

diff --git a/src/cls/journal/cls_journal.cc b/src/cls/journal/cls_journal.cc
index c0bd76138678..673bc04228b1 100644
--- a/src/cls/journal/cls_journal.cc
+++ b/src/cls/journal/cls_journal.cc
@@ -388,7 +388,7 @@ int journal_get_order(cls_method_context_t hctx, bufferlist *in,
  * none
  *
  * Output:
- * order (uint8_t)
+ * splay_width (uint8_t)
  * @returns 0 on success, negative error code on failure
  */
 int journal_get_splay_width(cls_method_context_t hctx, bufferlist *in,
diff --git a/src/pybind/rbd/rbd.pyx b/src/pybind/rbd/rbd.pyx
index 949504a34d2b..a15e47b70c7d 100644
--- a/src/pybind/rbd/rbd.pyx
+++ b/src/pybind/rbd/rbd.pyx
@@ -980,7 +980,7 @@ class RBD(object):
         with nogil:
             ret = rbd_trash_get(_ioctx, _image_id, &c_info)
         if ret != 0:
-            raise make_ex(ret, 'error restoring image from trash')
+            raise make_ex(ret, 'error retrieving image from trash')
 
         __source_string = ['USER', 'MIRRORING']
         info = {