]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
rgw: use pointer for is_truncated
authorOrit Wasserman <owasserm@redhat.com>
Sun, 30 Apr 2017 05:31:30 +0000 (08:31 +0300)
committerYehuda Sadeh <yehuda@redhat.com>
Mon, 5 Jun 2017 20:17:38 +0000 (13:17 -0700)
Signed-off-by: Orit Wasserman <owasserm@redhat.com>
src/cls/rgw/cls_rgw_client.cc
src/cls/rgw/cls_rgw_client.h
src/rgw/rgw_reshard.cc

index c2edf4f0b5f903180b3a7a0ff4c6ba82a84ba21b..da85cbe4175de5a62dfd510128a884ab9eda6a58 100644 (file)
@@ -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;
 }
index 46340ca32d4d7bb43a0d66f04ff6e858d28e6a34..fa3967ca21695781de298ac98744c09127ae373b 100644 (file)
@@ -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);
index 5385623b3ae7d8386c075b9522ae76a1f573fc1d..9564dda786b016022130dd09e7044994a1fe996d 100644 (file)
@@ -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;