From 93ee462ca6043dd0f2a1e6b2250db9a2ceb48625 Mon Sep 17 00:00:00 2001 From: Abhishek Varshney Date: Fri, 16 Jun 2017 17:58:14 +0530 Subject: [PATCH] rgw: In RGWListBucketMultiparts::execute(), use list_bucket_multipart() Fixes: http://tracker.ceph.com/issues/17164 Signed-off-by: Abhishek Varshney --- src/rgw/rgw_op.cc | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/src/rgw/rgw_op.cc b/src/rgw/rgw_op.cc index b50e85e5a38..64ec8a02b5c 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::iterator iter; RGWMultipartUploadEntry entry; -- 2.47.3