From 68ddf78d5bbe4681e92207d86f9ee7a110f67776 Mon Sep 17 00:00:00 2001
From: zhangshaowen <zhangshaowen@cmss.chinamobile.com>
Date: Mon, 4 Nov 2019 19:45:03 +0800
Subject: [PATCH] rgw: reshard list may return more than specified max_entries.

Signed-off-by: zhangshaowen <zhangshaowen@cmss.chinamobile.com>
---
 src/rgw/rgw_admin.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/rgw/rgw_admin.cc b/src/rgw/rgw_admin.cc
index 2c1ed88f5570..2d0c0630e978 100644
--- a/src/rgw/rgw_admin.cc
+++ b/src/rgw/rgw_admin.cc
@@ -6355,7 +6355,7 @@ next:
       string marker;
       do {
         entries.clear();
-        ret = reshard.list(i, marker, max_entries, entries, &is_truncated);
+        ret = reshard.list(i, marker, max_entries - count, entries, &is_truncated);
         if (ret < 0) {
           cerr << "Error listing resharding buckets: " << cpp_strerror(-ret) << std::endl;
           return ret;
-- 
2.47.3