From: John Spray <john.spray@redhat.com>
Date: Thu, 20 Jul 2017 11:58:41 +0000 (-0400)
Subject: common/options: fix overflowing 64 bit literals
X-Git-Tag: v12.1.2~192^2~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=4340f4b6c6793f361d8645ff3e0776224e586942;p=ceph.git

common/options: fix overflowing 64 bit literals

This manifested as a failure in objectstore tool test_fuse.sh

Signed-off-by: John Spray <john.spray@redhat.com>
---

diff --git a/src/common/options.cc b/src/common/options.cc
index 5f2e1f574c31..aff5608732ec 100644
--- a/src/common/options.cc
+++ b/src/common/options.cc
@@ -1250,7 +1250,7 @@ const std::vector<Option> ceph_options = {
   .set_description(""),
 
   Option("mon_data_size_warn", Option::TYPE_UINT, Option::LEVEL_ADVANCED)
-  .set_default(15*1024*1024*1024)
+  .set_default(15ull*1024*1024*1024)
   .set_description(""),
 
   Option("mon_warn_not_scrubbed", Option::TYPE_INT, Option::LEVEL_ADVANCED)
@@ -3539,7 +3539,7 @@ const std::vector<Option> ceph_options = {
   .set_description(""),
 
   Option("bluestore_block_size", Option::TYPE_UINT, Option::LEVEL_ADVANCED)
-  .set_default(10 * 1024*1024*1024)
+  .set_default(10ull * 1024*1024*1024)
   .set_description(""),
 
   Option("bluestore_block_create", Option::TYPE_BOOL, Option::LEVEL_ADVANCED)
@@ -3715,11 +3715,11 @@ const std::vector<Option> ceph_options = {
   .set_description(""),
 
   Option("bluestore_cache_size_hdd", Option::TYPE_UINT, Option::LEVEL_ADVANCED)
-  .set_default(1*1024*1024*1024)
+  .set_default(1ull*1024*1024*1024)
   .set_description(""),
 
   Option("bluestore_cache_size_ssd", Option::TYPE_UINT, Option::LEVEL_ADVANCED)
-  .set_default(3*1024*1024*1024)
+  .set_default(3ull*1024*1024*1024)
   .set_description(""),
 
   Option("bluestore_cache_meta_ratio", Option::TYPE_FLOAT, Option::LEVEL_ADVANCED)