From: Yehuda Sadeh <yehuda@redhat.com>
Date: Mon, 28 Nov 2016 22:20:03 +0000 (-0800)
Subject: rgw: omap_get_all() fixes
X-Git-Tag: v0.94.10~20^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e97ceb13242fd73b05a20b60208fee7f032e3ef3;p=ceph.git

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 8902557a1a5f..250fc63ca368 100644
--- 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;
     }