From: Abhishek Lekshmanan <abhishek@suse.com>
Date: Mon, 10 Dec 2018 23:30:46 +0000 (+0100)
Subject: rgw: mimic gconf changes
X-Git-Tag: v12.2.11~44
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c2bdebf542d304ea004bc64b7b1f10a7bd110d7a;p=ceph.git

rgw: mimic gconf changes

As the largeish change from master g_conf() isn't in mimic yet, use the g_conf
global structure, also make rgw_op use the value from req_info ceph context as
we do for all the requests

Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
(cherry picked from commit 01d647310ec2d7d423df1196eb2a7aef685d832e)
---

diff --git a/src/rgw/rgw_op.cc b/src/rgw/rgw_op.cc
index be78b75c7828..730de87fa31e 100644
--- a/src/rgw/rgw_op.cc
+++ b/src/rgw/rgw_op.cc
@@ -2284,7 +2284,7 @@ int RGWListBucket::parse_max_keys()
   // Some S3 clients explicitly send max-keys=0 to detect if the bucket is
   // empty without listing any items.
   return parse_value_and_bound(max_keys, max, 0,
-			g_conf().get_val<uint64_t>("rgw_max_listing_results"),
+			s->cct->_conf->get_val<uint64_t>("rgw_max_listing_results"),
 			default_max);
 }
 
diff --git a/src/rgw/rgw_rest.cc b/src/rgw/rgw_rest.cc
index 841dc2b5827c..67de9bb9b068 100644
--- a/src/rgw/rgw_rest.cc
+++ b/src/rgw/rgw_rest.cc
@@ -1660,8 +1660,8 @@ int RGWListMultipart_ObjStore::get_params()
   
   string str = s->info.args.get("max-parts");
   op_ret = parse_value_and_bound(str, max_parts, 0,
-			g_conf().get_val<uint64_t>("rgw_max_listing_results"),
-			max_parts);
+                                 g_conf->get_val<uint64_t>("rgw_max_listing_results"),
+                                 max_parts);
 
   return op_ret;
 }
@@ -1672,7 +1672,7 @@ int RGWListBucketMultiparts_ObjStore::get_params()
   prefix = s->info.args.get("prefix");
   string str = s->info.args.get("max-uploads");
   op_ret = parse_value_and_bound(str, max_uploads, 0,
-			g_conf().get_val<uint64_t>("rgw_max_listing_results"),
+			g_conf->get_val<uint64_t>("rgw_max_listing_results"),
 			default_max);
   if (op_ret < 0) {
     return op_ret;