]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
os/bluestore: fsck: int64_t for error count
authorSage Weil <sage@redhat.com>
Thu, 8 Aug 2019 21:31:01 +0000 (16:31 -0500)
committerIgor Fedotov <ifedotov@suse.com>
Mon, 18 Nov 2019 09:13:33 +0000 (12:13 +0300)
Just to be on the safe side.

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit dee8f8cb7e906596693f8c6e22ff74f815169c87)

 Conflicts:
src/os/bluestore/BlueStore.cc
        - trivial

src/os/bluestore/BlueStore.cc
src/os/bluestore/BlueStore.h

index c5f2b35997411b9b82ef5a04ab8c61673182df01..9d6bfb8640c681eb8be81be4795967094ba3a238 100644 (file)
@@ -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);
index 3ed67f93e73aa2c9c206b465a8535fd956ad71ea..09fd5ebac3a97422c9dab73aa8e5e5999d7d5f5a 100644 (file)
@@ -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);