From fefcabb910c20f0b2e3c1cb22313693eb3f2c99d Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Thu, 8 Aug 2019 16:31:01 -0500 Subject: [PATCH] os/bluestore: fsck: int64_t for error count Just to be on the safe side. Signed-off-by: Sage Weil (cherry picked from commit dee8f8cb7e906596693f8c6e22ff74f815169c87) Conflicts: src/os/bluestore/BlueStore.cc - trivial --- src/os/bluestore/BlueStore.cc | 4 ++-- src/os/bluestore/BlueStore.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/os/bluestore/BlueStore.cc b/src/os/bluestore/BlueStore.cc index c5f2b35997411..9d6bfb8640c68 100644 --- a/src/os/bluestore/BlueStore.cc +++ b/src/os/bluestore/BlueStore.cc @@ -5671,7 +5671,7 @@ int BlueStore::_balance_bluefs_freespace() return ret; } -int BlueStore::_open_collections(int *errors) +int BlueStore::_open_collections(int64_t *errors) { dout(10) << __func__ << dendl; ceph_assert(coll_map.empty()); @@ -6711,7 +6711,7 @@ int BlueStore::_fsck_check_extents( void BlueStore::_fsck_check_pool_statfs( BlueStore::per_pool_statfs& expected_pool_statfs, bool need_per_pool_stats, - int& errors, + int64_t& errors, BlueStoreRepairer* repairer) { auto it = db->get_iterator(PREFIX_STAT); diff --git a/src/os/bluestore/BlueStore.h b/src/os/bluestore/BlueStore.h index 3ed67f93e73aa..09fd5ebac3a97 100644 --- a/src/os/bluestore/BlueStore.h +++ b/src/os/bluestore/BlueStore.h @@ -2242,7 +2242,7 @@ private: void _close_fm(); int _open_alloc(); void _close_alloc(); - int _open_collections(int *errors=0); + int _open_collections(int64_t *errors=0); void _close_collections(); int _setup_block_symlink_or_file(string name, string path, uint64_t size, @@ -2350,7 +2350,7 @@ private: void _fsck_check_pool_statfs( per_pool_statfs& expected_pool_statfs, bool need_per_pool_stats, - int& errors, + int64_t& errors, BlueStoreRepairer* repairer); int _fsck(FSCKDepth depth, bool repair); -- 2.39.5