From: Sage Weil <sage@redhat.com>
Date: Thu, 8 Aug 2019 21:31:01 +0000 (-0500)
Subject: os/bluestore: fsck: int64_t for error count
X-Git-Tag: v15.1.0~1915^2~2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=dee8f8cb7e906596693f8c6e22ff74f815169c87;p=ceph-ci.git

os/bluestore: fsck: int64_t for error count

Just to be on the safe side.

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/os/bluestore/BlueStore.cc b/src/os/bluestore/BlueStore.cc
index 5c9797c7ecd..f88bb7b49ce 100644
--- a/src/os/bluestore/BlueStore.cc
+++ b/src/os/bluestore/BlueStore.cc
@@ -5862,7 +5862,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());
@@ -6857,7 +6857,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);
@@ -7013,7 +7013,7 @@ int BlueStore::_fsck(bool deep, bool repair)
 	  << " <<<START>>>"
 	  << (repair ? " repair" : " check")
 	  << (deep ? " (deep)" : " (shallow)") << " start" << dendl;
-  int errors = 0;
+  int64_t errors = 0;
   unsigned repaired = 0;
 
   typedef btree::btree_set<
diff --git a/src/os/bluestore/BlueStore.h b/src/os/bluestore/BlueStore.h
index da6725f5ad4..17e0649e5d7 100644
--- a/src/os/bluestore/BlueStore.h
+++ b/src/os/bluestore/BlueStore.h
@@ -2095,7 +2095,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,
@@ -2196,7 +2196,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);
 
   void _buffer_cache_write(