From: Jos Collin <jcollin@redhat.com>
Date: Wed, 3 Jul 2019 04:44:21 +0000 (+0530)
Subject: rgw: drop getting list-type when get_data is false
X-Git-Tag: v14.2.5~18^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=9d69c14c6f7e9ce5fe34acb32bcdf4d01c59cba0;p=ceph.git

rgw: drop getting list-type when get_data is false

Signed-off-by: Jos Collin <jcollin@redhat.com>
(cherry picked from commit ae56a918174cc6899bf7384004560ea57036b009)
---

diff --git a/src/rgw/rgw_rest_s3.cc b/src/rgw/rgw_rest_s3.cc
index 5cd6f238b11d..0a28abaeb455 100644
--- a/src/rgw/rgw_rest_s3.cc
+++ b/src/rgw/rgw_rest_s3.cc
@@ -3523,11 +3523,9 @@ RGWOp *RGWHandler_REST_Service_S3::op_post()
 RGWOp *RGWHandler_REST_Bucket_S3::get_obj_op(bool get_data)
 {
   // Non-website mode
-  int list_type = 1;
-  s->info.args.get_int("list-type", &list_type, 1);
-
-   // Non-website mode    // Non-website mode
   if (get_data) {   
+    int list_type = 1;
+    s->info.args.get_int("list-type", &list_type, 1);
     switch (list_type) {
       case 1:
         return new RGWListBucket_ObjStore_S3;