rgw: omap_get_all() fixes

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
(cherry picked from commit 99e866feb3f8aa0ff768d6253979b6b4fc0fa452)

diff --git a/src/rgw/rgw_rados.cc b/src/rgw/rgw_rados.cc
index 8902557a1a5fcb07388c5d2955e83acad859750c..250fc63ca3686921547b58932b8f99f6432d6447 100644 (file)
--- a/src/rgw/rgw_rados.cc
+++ b/src/rgw/rgw_rados.cc
@@ -7618,12 +7618,13 @@ int RGWRados::omap_get_all(rgw_obj& obj, bufferlist& header,
     return r;
   }
 
-  const int count = 1024;  // ?
+#define MAX_OMAP_GET_ENTRIES 1024
+  const int count = MAX_OMAP_GET_ENTRIES;
   string start_after;
 
   while (true) {
     std::map<string, bufferlist> t;
-    r = ref.ioctx.omap_get_vals(ref.oid, start_after, count, &m);
+    r = ref.ioctx.omap_get_vals(ref.oid, start_after, count, &t);
     if (r < 0) {
       return r;
     }