From: Abhishek Varshney <abhishek.varshney@flipkart.com>
Date: Fri, 16 Jun 2017 12:28:14 +0000 (+0530)
Subject: rgw: In RGWListBucketMultiparts::execute(), use list_bucket_multipart()
X-Git-Tag: v12.1.1~59^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=93ee462ca6043dd0f2a1e6b2250db9a2ceb48625;p=ceph.git

rgw: In RGWListBucketMultiparts::execute(), use list_bucket_multipart()

Fixes: http://tracker.ceph.com/issues/17164
Signed-off-by: Abhishek Varshney <abhishek.varshney@flipkart.com>
---

diff --git a/src/rgw/rgw_op.cc b/src/rgw/rgw_op.cc
index b50e85e5a386..64ec8a02b5c5 100644
--- a/src/rgw/rgw_op.cc
+++ b/src/rgw/rgw_op.cc
@@ -5333,17 +5333,12 @@ void RGWListBucketMultiparts::execute()
   }
   marker_meta = marker.get_meta();
 
-  RGWRados::Bucket target(store, s->bucket_info);
-  RGWRados::Bucket::List list_op(&target);
-
-  list_op.params.prefix = prefix;
-  list_op.params.delim = delimiter;
-  list_op.params.marker = marker_meta;
-  list_op.params.ns = mp_ns;
-  list_op.params.filter = &mp_filter;
+  op_ret = list_bucket_multiparts(store, s->bucket_info, prefix, marker_meta, delimiter,
+                                  max_uploads, &objs, &common_prefixes, &is_truncated);
+  if (op_ret < 0) {
+    return;
+  }
 
-  op_ret = list_op.list_objects(max_uploads, &objs, &common_prefixes,
-				&is_truncated);
   if (!objs.empty()) {
     vector<rgw_bucket_dir_entry>::iterator iter;
     RGWMultipartUploadEntry entry;