From: Orit Wasserman <owasserm@redhat.com>
Date: Sun, 30 Apr 2017 05:31:30 +0000 (+0300)
Subject: rgw: use pointer for is_truncated
X-Git-Tag: ses5-milestone6~8^2~7^2~71
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=0af96c178ae2ce70bff0f893aba38b329da44ea2;p=ceph.git

rgw: use pointer for is_truncated

Signed-off-by: Orit Wasserman <owasserm@redhat.com>
---

diff --git a/src/cls/rgw/cls_rgw_client.cc b/src/cls/rgw/cls_rgw_client.cc
index c2edf4f0b5f9..da85cbe4175d 100644
--- a/src/cls/rgw/cls_rgw_client.cc
+++ b/src/cls/rgw/cls_rgw_client.cc
@@ -789,7 +789,7 @@ void cls_rgw_reshard_add(librados::ObjectWriteOperation& op, const cls_rgw_resha
 }
 
 int cls_rgw_reshard_list(librados::IoCtx& io_ctx, const string& oid, string& marker, uint32_t max,
-                         list<cls_rgw_reshard_entry>& entries, bool& is_truncated)
+                         list<cls_rgw_reshard_entry>& entries, bool* is_truncated)
 {
   bufferlist in, out;
   struct cls_rgw_reshard_list_op call;
@@ -809,7 +809,7 @@ int cls_rgw_reshard_list(librados::IoCtx& io_ctx, const string& oid, string& mar
   }
 
   entries.swap(op_ret.entries);
-  is_truncated = op_ret.is_truncated;
+  *is_truncated = op_ret.is_truncated;
 
   return 0;
 }
diff --git a/src/cls/rgw/cls_rgw_client.h b/src/cls/rgw/cls_rgw_client.h
index 46340ca32d4d..fa3967ca2169 100644
--- a/src/cls/rgw/cls_rgw_client.h
+++ b/src/cls/rgw/cls_rgw_client.h
@@ -496,7 +496,7 @@ int cls_rgw_lc_list(librados::IoCtx& io_ctx, string& oid,
 /* resharding */
 void cls_rgw_reshard_add(librados::ObjectWriteOperation& op, const cls_rgw_reshard_entry& entry);
 int cls_rgw_reshard_list(librados::IoCtx& io_ctx, const string& oid, string& marker, uint32_t max,
-                         list<cls_rgw_reshard_entry>& entries, bool& is_truncated);
+                         list<cls_rgw_reshard_entry>& entries, bool* is_truncated);
 int cls_rgw_reshard_get(librados::IoCtx& io_ctx, const string& oid, cls_rgw_reshard_entry& entry);
 int cls_rgw_reshard_get_head(librados::IoCtx& io_ctx, const string& oid, cls_rgw_reshard_entry& entry);
 void cls_rgw_reshard_remove(librados::ObjectWriteOperation& op, const cls_rgw_reshard_entry& entry);
diff --git a/src/rgw/rgw_reshard.cc b/src/rgw/rgw_reshard.cc
index 5385623b3ae7..9564dda786b0 100644
--- a/src/rgw/rgw_reshard.cc
+++ b/src/rgw/rgw_reshard.cc
@@ -83,7 +83,7 @@ int RGWReshard::list(string& marker, uint32_t max, std::list<cls_rgw_reshard_ent
   if (ret < 0)
     return ret;
 
-  ret =  cls_rgw_reshard_list(io_ctx, reshard_oid, marker, max, entries, is_truncated);
+  ret =  cls_rgw_reshard_list(io_ctx, reshard_oid, marker, max, entries, &is_truncated);
 
   l.unlock(&io_ctx, reshard_oid);
   return ret;