From 6ea6ccec019cf95e70bbab177c061c349ab275e6 Mon Sep 17 00:00:00 2001 From: Jianpeng Ma Date: Tue, 9 Jan 2018 19:51:26 +0800 Subject: [PATCH] os/bluestore: using macro OBJECT_MAX_SIZE to check object max size. Signed-off-by: Jianpeng Ma --- src/os/bluestore/BlueStore.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/os/bluestore/BlueStore.cc b/src/os/bluestore/BlueStore.cc index 7006cc385a509..b998640c5c4ec 100644 --- a/src/os/bluestore/BlueStore.cc +++ b/src/os/bluestore/BlueStore.cc @@ -4114,9 +4114,9 @@ int BlueStore::_open_path() // sanity check(s) auto osd_max_object_size = cct->_conf->get_val("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); -- 2.39.5