From e146ff548fa730a746165aa750edccf8c12d3744 Mon Sep 17 00:00:00 2001 From: Yan Jun Date: Fri, 17 Jun 2016 15:05:29 +0800 Subject: [PATCH] rgw: just make the code more concise Signed-off-by: Yan Jun --- src/rgw/rgw_bucket.cc | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/rgw/rgw_bucket.cc b/src/rgw/rgw_bucket.cc index f8399b79f3770..f2250be99881a 100644 --- a/src/rgw/rgw_bucket.cc +++ b/src/rgw/rgw_bucket.cc @@ -479,23 +479,23 @@ int rgw_remove_bucket(RGWRados *store, rgw_bucket& bucket, bool delete_children) if (delete_children) { int max = 1000; - ret = list_op.list_objects(max, &objs, &common_prefixes, NULL); - if (ret < 0) - return ret; - while (!objs.empty()) { + do { + objs.clear(); + + ret = list_op.list_objects(max, &objs, &common_prefixes, NULL); + if (ret < 0) + return ret; + std::vector::iterator it = objs.begin(); for (; it != objs.end(); ++it) { ret = rgw_remove_object(store, info, bucket, (*it).key); if (ret < 0) return ret; } - objs.clear(); - ret = list_op.list_objects(max, &objs, &common_prefixes, NULL); - if (ret < 0) - return ret; - } + } while (!objs.empty()); + } ret = rgw_bucket_sync_user_stats(store, bucket.tenant, bucket.name); -- 2.39.5