From: luo rixin Date: Mon, 10 Jul 2023 03:56:12 +0000 (+0800) Subject: crush/CrushLocation: remove useless flag X-Git-Tag: v19.0.0~847^2~1 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=872623b49987a991f30c7f9c8699249eac93379f;p=ceph.git crush/CrushLocation: remove useless flag In pr 'https://github.com/ceph/ceph/pull/51352', we have crimson/crush/CrushLocation.cc, there is no need crimson releated code in crush/CrushLocation.cc, so just remove. Signed-off-by: luo rixin --- diff --git a/src/crush/CrushLocation.cc b/src/crush/CrushLocation.cc index eccffc8fed5a..fb2ada8d6d27 100644 --- a/src/crush/CrushLocation.cc +++ b/src/crush/CrushLocation.cc @@ -45,9 +45,6 @@ int CrushLocation::update_from_hook() if (cct->_conf->crush_location_hook.length() == 0) return 0; -#if defined(WITH_SEASTAR) && !defined(WITH_ALIEN) - ceph_abort_msg("crimson does not support crush_location_hook, it must stay empty"); -#else if (0 != access(cct->_conf->crush_location_hook.c_str(), R_OK)) { lderr(cct) << "the user define crush location hook: " << cct->_conf->crush_location_hook << " may not exist or can not access it" << dendl; @@ -95,7 +92,6 @@ int CrushLocation::update_from_hook() bl.begin().copy(bl.length(), out); out.erase(out.find_last_not_of(" \n\r\t")+1); return _parse(out); -#endif // WITH_SEASTAR && !WITH_ALIEN } int CrushLocation::init_on_startup()