From 297e33204fbad8c26b850d0a52d9780748e7d2e3 Mon Sep 17 00:00:00 2001
From: Victor Denisov <denisovenator@gmail.com>
Date: Mon, 11 Dec 2017 18:27:21 -0800
Subject: [PATCH] cls_rbd: Address comments

Signed-off-by: Victor Denisov <denisovenator@gmail.com>
---
 src/cls/rbd/cls_rbd.cc        | 26 ++++++++++++--------------
 src/cls/rbd/cls_rbd_client.cc |  3 +++
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/src/cls/rbd/cls_rbd.cc b/src/cls/rbd/cls_rbd.cc
index 94a5d8cf1fa..c6e43a6064d 100644
--- a/src/cls/rbd/cls_rbd.cc
+++ b/src/cls/rbd/cls_rbd.cc
@@ -4920,8 +4920,8 @@ int group_image_list(cls_method_context_t hctx,
   bool more;
   do {
     int r = cls_cxx_map_get_vals(hctx, last_read,
-				     cls::rbd::RBD_GROUP_IMAGE_KEY_PREFIX,
-				     max_read, &vals, &more);
+				 cls::rbd::RBD_GROUP_IMAGE_KEY_PREFIX,
+				 max_read, &vals, &more);
     if (r < 0)
       return r;
 
@@ -5114,8 +5114,8 @@ static int group_snap_list(cls_method_context_t hctx,
   bool more;
   do {
     int r = cls_cxx_map_get_vals(hctx, last_read,
-				     RBD_GROUP_SNAP_KEY_PREFIX,
-				     max_read, &vals, &more);
+				 RBD_GROUP_SNAP_KEY_PREFIX,
+				 max_read, &vals, &more);
     if (r < 0)
       return r;
 
@@ -5154,7 +5154,7 @@ static int check_duplicate_snap_name(cls_method_context_t hctx,
     if (r < 0) {
       return r;
     }
-    for (auto snap: page) {
+    for (auto& snap: page) {
       if (snap.name == snap_name && snap.id != snap_id) {
 	return -EEXIST;
       }
@@ -5177,9 +5177,10 @@ static int check_duplicate_snap_id(cls_method_context_t hctx,
   int r = cls_cxx_map_get_val(hctx, snap_key, &bl);
   if (r == -ENOENT) {
     return 0;
-  } else {
-    return -EEXIST;
+  } else if (r < 0) {
+    return r;
   }
+  return -EEXIST;
 }
 
 }
@@ -5296,9 +5297,7 @@ int group_snap_remove(cls_method_context_t hctx,
     return -EINVAL;
   }
 
-  cls::rbd::GroupSnapshot group_snap;
-  group_snap.id = snap_id;
-  std::string snap_key = group::snap_key(group_snap.id);
+  std::string snap_key = group::snap_key(snap_id);
 
   CLS_LOG(20, "removing snapshot with key %s", snap_key.c_str());
   int r = cls_cxx_map_remove_key(hctx, snap_key);
@@ -5328,16 +5327,14 @@ int group_snap_get_by_id(cls_method_context_t hctx,
     return -EINVAL;
   }
 
-  cls::rbd::GroupSnapshot group_snap;
-  group_snap.id = snap_id;
-
   bufferlist snapbl;
 
-  int r = cls_cxx_map_get_val(hctx, group::snap_key(group_snap.id), &snapbl);
+  int r = cls_cxx_map_get_val(hctx, group::snap_key(snap_id), &snapbl);
   if (r < 0) {
     return r;
   }
 
+  cls::rbd::GroupSnapshot group_snap;
   bufferlist::iterator iter = snapbl.begin();
   try {
     ::decode(group_snap, iter);
@@ -5579,6 +5576,7 @@ int trash_get(cls_method_context_t hctx, bufferlist *in, bufferlist *out)
   } catch (const buffer::error &err) {
     return -EINVAL;
   }
+
   CLS_LOG(20, "trash_get_image id=%s", id.c_str());
 
 
diff --git a/src/cls/rbd/cls_rbd_client.cc b/src/cls/rbd/cls_rbd_client.cc
index b41428cec3c..8af0fe7c069 100644
--- a/src/cls/rbd/cls_rbd_client.cc
+++ b/src/cls/rbd/cls_rbd_client.cc
@@ -2197,6 +2197,7 @@ namespace librbd {
 
       return 0;
     }
+
     int trash_list(librados::IoCtx *ioctx,
                    const std::string &start, uint64_t max_return,
                    map<string, cls::rbd::TrashImageSpec> *entries)
@@ -2209,6 +2210,7 @@ namespace librbd {
       if (r < 0) {
 	return r;
       }
+
       bufferlist::iterator iter = out_bl.begin();
       return trash_list_finish(&iter, entries);
     }
@@ -2233,6 +2235,7 @@ namespace librbd {
       return 0;
     }
 
+
     int trash_get(librados::IoCtx *ioctx, const std::string &id,
                   cls::rbd::TrashImageSpec *trash_spec)
     {
-- 
2.39.5