From: Jason Dillaman <dillaman@redhat.com>
Date: Wed, 11 Mar 2015 22:21:47 +0000 (-0400)
Subject: cls_rbd_client: snapshot_list no longer retrieves features
X-Git-Tag: v9.0.0~37^2~12
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=58d59d6e52f9b62692868d06b99c7b8a00c6d7fa;p=ceph.git

cls_rbd_client: snapshot_list no longer retrieves features

Features should now be consistent across snapshots, so
no reason to retrieve them.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
---

diff --git a/src/cls/rbd/cls_rbd_client.cc b/src/cls/rbd/cls_rbd_client.cc
index c4aff8138eb..d387fa71452 100644
--- a/src/cls/rbd/cls_rbd_client.cc
+++ b/src/cls/rbd/cls_rbd_client.cc
@@ -406,7 +406,6 @@ namespace librbd {
 		      const std::vector<snapid_t> &ids,
 		      std::vector<string> *names,
 		      std::vector<uint64_t> *sizes,
-		      std::vector<uint64_t> *features,
 		      std::vector<parent_info> *parents,
 		      std::vector<uint8_t> *protection_statuses)
     {
@@ -414,8 +413,6 @@ namespace librbd {
       names->resize(ids.size());
       sizes->clear();
       sizes->resize(ids.size());
-      features->clear();
-      features->resize(ids.size());
       parents->clear();
       parents->resize(ids.size());
       protection_statuses->clear();
@@ -425,17 +422,15 @@ namespace librbd {
       for (vector<snapid_t>::const_iterator it = ids.begin();
 	   it != ids.end(); ++it) {
 	snapid_t snap_id = it->val;
-	bufferlist bl1, bl2, bl3, bl4, bl5;
+	bufferlist bl1, bl2, bl3, bl4;
 	::encode(snap_id, bl1);
 	op.exec("rbd", "get_snapshot_name", bl1);
 	::encode(snap_id, bl2);
 	op.exec("rbd", "get_size", bl2);
 	::encode(snap_id, bl3);
-	op.exec("rbd", "get_features", bl3);
+	op.exec("rbd", "get_parent", bl3);
 	::encode(snap_id, bl4);
-	op.exec("rbd", "get_parent", bl4);
-	::encode(snap_id, bl5);
-	op.exec("rbd", "get_protection_status", bl5);
+	op.exec("rbd", "get_protection_status", bl4);
       }
 
       bufferlist outbl;
@@ -447,15 +442,11 @@ namespace librbd {
 	bufferlist::iterator iter = outbl.begin();
 	for (size_t i = 0; i < ids.size(); ++i) {
 	  uint8_t order;
-	  uint64_t incompat_features;
 	  // get_snapshot_name
 	  ::decode((*names)[i], iter);
 	  // get_size
 	  ::decode(order, iter);
 	  ::decode((*sizes)[i], iter);
-	  // get_features
-	  ::decode((*features)[i], iter);
-	  ::decode(incompat_features, iter);
 	  // get_parent
 	  ::decode((*parents)[i].spec.pool_id, iter);
 	  ::decode((*parents)[i].spec.image_id, iter);
diff --git a/src/cls/rbd/cls_rbd_client.h b/src/cls/rbd/cls_rbd_client.h
index 080f5079e88..547e152e1e8 100644
--- a/src/cls/rbd/cls_rbd_client.h
+++ b/src/cls/rbd/cls_rbd_client.h
@@ -74,7 +74,6 @@ namespace librbd {
 		      const std::vector<snapid_t> &ids,
 		      std::vector<string> *names,
 		      std::vector<uint64_t> *sizes,
-		      std::vector<uint64_t> *features,
 		      std::vector<parent_info> *parents,
 		      std::vector<uint8_t> *protection_statuses);
     int copyup(librados::IoCtx *ioctx, const std::string &oid,