From 7cde2e51e45da77ab28ab280bb648197023e063d Mon Sep 17 00:00:00 2001
From: John Spray <john.spray@redhat.com>
Date: Thu, 13 Jul 2017 13:14:59 -0400
Subject: [PATCH] rgw: set mins on options to avoid unneeded max()

Signed-off-by: John Spray <john.spray@redhat.com>
---
 src/common/options.cc | 3 +++
 src/rgw/rgw_file.cc   | 3 +--
 src/rgw/rgw_rados.cc  | 4 ++--
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/common/options.cc b/src/common/options.cc
index 3fb33ce8f8e0..e257fe792205 100644
--- a/src/common/options.cc
+++ b/src/common/options.cc
@@ -4911,10 +4911,12 @@ const std::vector<Option> ceph_options = {
 
   Option("rgw_nfs_namespace_expire_secs", Option::TYPE_INT, Option::LEVEL_ADVANCED)
   .set_default(300)
+  .set_min(1)
   .set_description(""),
 
   Option("rgw_nfs_max_gc", Option::TYPE_INT, Option::LEVEL_ADVANCED)
   .set_default(300)
+  .set_min(1)
   .set_description(""),
 
   Option("rgw_nfs_write_completion_interval_s", Option::TYPE_INT, Option::LEVEL_ADVANCED)
@@ -4995,6 +4997,7 @@ const std::vector<Option> ceph_options = {
 
   Option("rgw_usage_max_user_shards", Option::TYPE_INT, Option::LEVEL_ADVANCED)
   .set_default(1)
+  .set_min(1)
   .set_description(""),
 
   Option("rgw_enable_ops_log", Option::TYPE_BOOL, Option::LEVEL_ADVANCED)
diff --git a/src/rgw/rgw_file.cc b/src/rgw/rgw_file.cc
index bb98216cc56c..83df3ddbf01b 100644
--- a/src/rgw/rgw_file.cc
+++ b/src/rgw/rgw_file.cc
@@ -839,8 +839,7 @@ namespace rgw {
       = get_context()->_conf->rgw_nfs_namespace_expire_secs;
 
     /* max events to gc in one cycle */
-    uint32_t max_ev =
-      std::max(int64_t(1), get_context()->_conf->rgw_nfs_max_gc);
+    uint32_t max_ev = get_context()->_conf->rgw_nfs_max_gc;
 
     struct timespec now, expire_ts;
     event_vector ve;
diff --git a/src/rgw/rgw_rados.cc b/src/rgw/rgw_rados.cc
index c77432afe68d..566e5daeb121 100644
--- a/src/rgw/rgw_rados.cc
+++ b/src/rgw/rgw_rados.cc
@@ -5034,12 +5034,12 @@ static void usage_log_hash(CephContext *cct, const string& name, string& hash, u
   uint32_t val = index;
 
   if (!name.empty()) {
-    int max_user_shards = max(cct->_conf->rgw_usage_max_user_shards, int64_t(1));
+    int max_user_shards = cct->_conf->rgw_usage_max_user_shards;
     val %= max_user_shards;
     val += ceph_str_hash_linux(name.c_str(), name.size());
   }
   char buf[17];
-  int max_shards = max(cct->_conf->rgw_usage_max_shards, int64_t(1));
+  int max_shards = cct->_conf->rgw_usage_max_shards;
   snprintf(buf, sizeof(buf), RGW_USAGE_OBJ_PREFIX "%u", (unsigned)(val % max_shards));
   hash = buf;
 }
-- 
2.47.3