]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
os/bluestore: using macro OBJECT_MAX_SIZE to check object max size.
authorJianpeng Ma <jianpeng.ma@intel.com>
Tue, 9 Jan 2018 11:51:26 +0000 (19:51 +0800)
committerJianpeng Ma <jianpeng.ma@intel.com>
Tue, 9 Jan 2018 13:41:41 +0000 (21:41 +0800)
Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
src/os/bluestore/BlueStore.cc

index 7006cc385a50929d14ce7644093b1d2c45d307bb..b998640c5c4ec06eee6370a190c4a69f7f864619 100644 (file)
@@ -4114,9 +4114,9 @@ int BlueStore::_open_path()
   // sanity check(s)
   auto osd_max_object_size =
     cct->_conf->get_val<uint64_t>("osd_max_object_size");
-  if (osd_max_object_size >= 4*1024*1024*1024ull) {
-    derr << __func__ << " osd_max_object_size: " << osd_max_object_size
-      << "; BlueStore has hard limit of 4GB." << dendl;
+  if (osd_max_object_size >= (uint64_t)OBJECT_MAX_SIZE) {
+    derr << __func__ << " osd_max_object_size >= 0x" << std::hex << OBJECT_MAX_SIZE
+      << "; BlueStore has hard limit of 0x" << OBJECT_MAX_SIZE << "." <<  std::dec << dendl;
     return -EINVAL;
   }
   assert(path_fd < 0);