From 8e39a00ed184838e16f1114bcfe3d362bc88a012 Mon Sep 17 00:00:00 2001 From: Rishabh Dave Date: Thu, 7 Sep 2023 03:46:39 +0530 Subject: [PATCH] mon/FSCommands: fix variable names and function names in calls PR #51942 today and PR #52409 was merged last week. Latter PR changed "fs" to "fsp" and made mds_map and fscid private and introduced get_mds_map() and get_fsicd() methods instead. Combination of former and latter PR introduced compilation errors & made it impossible to build the binaries on the latest main branch. This commit attemps to fix this issue. Fixes: https://tracker.ceph.com/issues/62729 Signed-off-by: Rishabh Dave --- src/mon/FSCommands.cc | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/mon/FSCommands.cc b/src/mon/FSCommands.cc index 31dc76cba6242..de8695fb783c8 100644 --- a/src/mon/FSCommands.cc +++ b/src/mon/FSCommands.cc @@ -731,24 +731,24 @@ public: } if (refuse_standby_for_another_fs) { - if (!(fs->mds_map.test_flag(CEPH_MDSMAP_REFUSE_STANDBY_FOR_ANOTHER_FS))) { + if (!(fsp->get_mds_map().test_flag(CEPH_MDSMAP_REFUSE_STANDBY_FOR_ANOTHER_FS))) { fsmap.modify_filesystem( - fs->fscid, - [](std::shared_ptr fs) + fsp->get_fscid(), + [](auto&& fs) { - fs->mds_map.set_flag(CEPH_MDSMAP_REFUSE_STANDBY_FOR_ANOTHER_FS); + fs.get_mds_map().set_flag(CEPH_MDSMAP_REFUSE_STANDBY_FOR_ANOTHER_FS); }); ss << "set to refuse standby for another fs"; } else { ss << "to refuse standby for another fs is already set"; } } else { - if (fs->mds_map.test_flag(CEPH_MDSMAP_REFUSE_STANDBY_FOR_ANOTHER_FS)) { + if (fsp->get_mds_map().test_flag(CEPH_MDSMAP_REFUSE_STANDBY_FOR_ANOTHER_FS)) { fsmap.modify_filesystem( - fs->fscid, - [](std::shared_ptr fs) + fsp->get_fscid(), + [](auto&& fs) { - fs->mds_map.clear_flag(CEPH_MDSMAP_REFUSE_STANDBY_FOR_ANOTHER_FS); + fs.get_mds_map().clear_flag(CEPH_MDSMAP_REFUSE_STANDBY_FOR_ANOTHER_FS); }); ss << "allowed to use standby for another fs"; } else { -- 2.39.5