From 978d7b4713e01ea568f0aa50c8140c0b1db275e5 Mon Sep 17 00:00:00 2001
From: Haomai Wang <haomaiwang@gmail.com>
Date: Fri, 13 Mar 2015 21:27:55 +0800
Subject: [PATCH] librbd: Fix typo and prefix ++

Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
---
 src/cls/rbd/cls_rbd.cc | 4 ++--
 src/librbd/internal.cc | 4 ++--
 src/rbd.cc             | 5 ++---
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/cls/rbd/cls_rbd.cc b/src/cls/rbd/cls_rbd.cc
index 577f519f5c3..413b066bc22 100644
--- a/src/cls/rbd/cls_rbd.cc
+++ b/src/cls/rbd/cls_rbd.cc
@@ -105,7 +105,7 @@ cls_method_handle_t h_old_snapshot_add;
 cls_method_handle_t h_old_snapshot_remove;
 
 #define RBD_MAX_KEYS_READ 64
-#define RBD_MAX_MEATADATA_KEYS 1024
+#define RBD_MAX_METAADATA_KEYS 1024
 #define RBD_SNAP_KEY_PREFIX "snapshot_"
 #define RBD_DIR_ID_KEY_PREFIX "id_"
 #define RBD_DIR_NAME_KEY_PREFIX "name_"
@@ -2139,7 +2139,7 @@ int metadata_list(cls_method_context_t hctx, bufferlist *in, bufferlist *out)
   map<string, bufferlist> vals;
   map<string, string> out_map;
   int r = cls_cxx_map_get_vals(hctx, RBD_METADATA_KEY_PREFIX, RBD_METADATA_KEY_PREFIX,
-                               RBD_MAX_MEATADATA_KEYS, &vals);
+                               RBD_MAX_METAADATA_KEYS, &vals);
   if (r < 0) {
     CLS_ERR("failed to read the vals off of disk: %s", cpp_strerror(r).c_str());
     return r;
diff --git a/src/librbd/internal.cc b/src/librbd/internal.cc
index b29ede86a38..337ac75a3f4 100644
--- a/src/librbd/internal.cc
+++ b/src/librbd/internal.cc
@@ -1149,7 +1149,7 @@ reprotect_and_return_err:
       lderr(cct) << "couldn't list metadata: " << r << dendl;
       goto err_close_child;
     }
-    for (map<string, string>::iterator it = pairs.begin(); it != pairs.end(); it++) {
+    for (map<string, string>::iterator it = pairs.begin(); it != pairs.end(); ++it) {
       r = cls_client::metadata_set(&c_ioctx, c_imctx->header_oid,
                                    it->first, it->second);
       if (r < 0) {
@@ -2284,7 +2284,7 @@ reprotect_and_return_err:
       lderr(cct) << "couldn't list metadata: " << r << dendl;
       return r;
     }
-    for (map<string, string>::iterator it = pairs.begin(); it != pairs.end(); it++) {
+    for (map<string, string>::iterator it = pairs.begin(); it != pairs.end(); ++it) {
       r = cls_client::metadata_set(&dest->md_ctx, dest->header_oid, it->first, it->second);
       if (r < 0) {
         lderr(cct) << "couldn't set metadata: " << r << dendl;
diff --git a/src/rbd.cc b/src/rbd.cc
index 695a977e154..f5b33501837 100644
--- a/src/rbd.cc
+++ b/src/rbd.cc
@@ -2957,8 +2957,7 @@ if (!set_conf_param(v, p1, p2, p3)) { \
       opt_cmd != OPT_INFO && opt_cmd != OPT_LIST &&
       opt_cmd != OPT_SNAP_LIST && opt_cmd != OPT_LOCK_LIST &&
       opt_cmd != OPT_CHILDREN && opt_cmd != OPT_DIFF &&
-      opt_cmd != OPT_METADATA_LIST && opt_cmd != OPT_DIFF &&
-      opt_cmd != OPT_STATUS) {
+      opt_cmd != OPT_METADATA_LIST && opt_cmd != OPT_STATUS) {
     cerr << "rbd: command doesn't use output formatting"
 	 << std::endl;
     return EXIT_FAILURE;
@@ -3578,7 +3577,7 @@ if (!set_conf_param(v, p1, p2, p3)) { \
   case OPT_METADATA_SET:
     r = do_metadata_set(image, key, value);
     if (r < 0) {
-      cerr << "rbd: listing metadata failed: " << cpp_strerror(r) << std::endl;
+      cerr << "rbd: setting metadata failed: " << cpp_strerror(r) << std::endl;
       return -r;
     }
     break;