update sources to v12.1.1

[ceph.git] / ceph / src / rgw / rgw_metadata.cc

diff --git a/ceph/src/rgw/rgw_metadata.cc b/ceph/src/rgw/rgw_metadata.cc
index 5a286b4aeb67509c714342c8d0859753ce72e293..f81c4490ae82160d605346f72706b1e05145a824 100644 (file)
--- a/ceph/src/rgw/rgw_metadata.cc
+++ b/ceph/src/rgw/rgw_metadata.cc
@@ -150,12 +150,18 @@ int RGWMetadataLog::list_entries(void *handle,
     return 0;
   }
 
+  std::string next_marker;
   int ret = store->time_log_list(ctx->cur_oid, ctx->from_time, ctx->end_time,
                                 max_entries, entries, ctx->marker,
-                                last_marker, truncated);
+                                &next_marker, truncated);
   if ((ret < 0) && (ret != -ENOENT))
     return ret;
 
+  ctx->marker = std::move(next_marker);
+  if (last_marker) {
+    *last_marker = ctx->marker;
+  }
+
   if (ret == -ENOENT)
     *truncated = false;