From 33fdd5e449fb2f1ba8dfc170d9eb2dd9fb7eb27d Mon Sep 17 00:00:00 2001
From: Abutalib Aghayev <agayev@psu.edu>
Date: Fri, 18 Jun 2021 10:03:08 -0400
Subject: [PATCH] os/bluestore: Pass in parameters using a const reference
 instead of a pointer.

Signed-off-by: Abutalib Aghayev <agayev@psu.edu>
---
 src/blk/BlockDevice.h                    | 2 +-
 src/blk/zoned/HMSMRDevice.cc             | 4 ++--
 src/blk/zoned/HMSMRDevice.h              | 2 +-
 src/os/bluestore/BlueStore.cc            | 6 +++---
 src/os/bluestore/ZonedFreelistManager.cc | 8 +++-----
 src/os/bluestore/ZonedFreelistManager.h  | 4 ++--
 6 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/src/blk/BlockDevice.h b/src/blk/BlockDevice.h
index b67312af2f85..da80142ffe32 100644
--- a/src/blk/BlockDevice.h
+++ b/src/blk/BlockDevice.h
@@ -199,7 +199,7 @@ public:
     ceph_assert(is_smr());
     return conventional_region_size;
   }
-  virtual void reset_zones(const std::set<uint64_t> *zones) {
+  virtual void reset_zones(const std::set<uint64_t>& zones) {
     ceph_assert(is_smr());
   }
 
diff --git a/src/blk/zoned/HMSMRDevice.cc b/src/blk/zoned/HMSMRDevice.cc
index 61a0d7d0affe..25d00bdbb759 100644
--- a/src/blk/zoned/HMSMRDevice.cc
+++ b/src/blk/zoned/HMSMRDevice.cc
@@ -412,8 +412,8 @@ void HMSMRDevice::_detect_vdo()
   return;
 }
 
-void HMSMRDevice::reset_zones(const std::set<uint64_t> *zones) {
-  for (auto zone_num : *zones) {
+void HMSMRDevice::reset_zones(const std::set<uint64_t>& zones) {
+  for (auto zone_num : zones) {
     if (zbd_reset_zones(zbd_dev, zone_num * zone_size, zone_size) != 0) {
       derr << __func__ << " resetting zone failed for zone " << zone_num << dendl;
     }
diff --git a/src/blk/zoned/HMSMRDevice.h b/src/blk/zoned/HMSMRDevice.h
index 0656a1dfed6f..0efa78111bab 100644
--- a/src/blk/zoned/HMSMRDevice.h
+++ b/src/blk/zoned/HMSMRDevice.h
@@ -136,7 +136,7 @@ public:
 
   bool is_smr() const final { return true; }
 
-  void reset_zones(const std::set<uint64_t> *zones) override;
+  void reset_zones(const std::set<uint64_t>& zones) override;
 
   bool get_thin_utilization(uint64_t *total, uint64_t *avail) const final;
 
diff --git a/src/os/bluestore/BlueStore.cc b/src/os/bluestore/BlueStore.cc
index 19faaa8859f9..e60bb5523a8e 100644
--- a/src/os/bluestore/BlueStore.cc
+++ b/src/os/bluestore/BlueStore.cc
@@ -12418,12 +12418,12 @@ void BlueStore::_zoned_cleaner_thread() {
       dout(20) << __func__ << " wake" << dendl;
     } else {
       l.unlock();
-      f->mark_zones_to_clean_in_progress(zones_to_clean, db);
+      f->mark_zones_to_clean_in_progress(*zones_to_clean, db);
       for (auto zone_num : *zones_to_clean) {
 	_zoned_clean_zone(zone_num);
       }
-      bdev->reset_zones(zones_to_clean);
-      f->mark_zones_to_clean_free(zones_to_clean, db);
+      bdev->reset_zones(*zones_to_clean);
+      f->mark_zones_to_clean_free(*zones_to_clean, db);
       a->mark_zones_to_clean_free();
       l.lock();
     }
diff --git a/src/os/bluestore/ZonedFreelistManager.cc b/src/os/bluestore/ZonedFreelistManager.cc
index 40e4f51c1cc5..c077ca2e609e 100644
--- a/src/os/bluestore/ZonedFreelistManager.cc
+++ b/src/os/bluestore/ZonedFreelistManager.cc
@@ -315,19 +315,17 @@ int ZonedFreelistManager::_read_cfg(cfg_reader_t cfg_reader) {
 }
 
 void ZonedFreelistManager::mark_zones_to_clean_free(
-    const std::set<uint64_t> *zones_to_clean, KeyValueDB *kvdb) {
+    const std::set<uint64_t>& zones_to_clean, KeyValueDB *kvdb) {
   dout(10) << __func__ << dendl;
 
   KeyValueDB::Transaction txn = kvdb->get_transaction();
-  for (auto zone_num : *zones_to_clean) {
+  for (auto zone_num : zones_to_clean) {
     ldout(cct, 10) << __func__ << " zone " << zone_num << " is now clean in DB" << dendl;
 
     zone_state_t zone_state;
     write_zone_state_to_db(zone_num, zone_state, txn);
   }
-
   txn->rmkey(meta_prefix, "cleaning_in_progress_zones");
-
   kvdb->submit_transaction_sync(txn);
 }
 
@@ -336,7 +334,7 @@ void ZonedFreelistManager::mark_zones_to_clean_free(
 // if there is a key "cleaning_in_progress_zones" in the meta_prefix namespace,
 // and if so, will read the zones and resume cleaning.
 void ZonedFreelistManager::mark_zones_to_clean_in_progress(
-    const std::set<uint64_t> *zones_to_clean, KeyValueDB *kvdb) {
+    const std::set<uint64_t>& zones_to_clean, KeyValueDB *kvdb) {
   dout(10) << __func__ << dendl;
 
   bufferlist bl;
diff --git a/src/os/bluestore/ZonedFreelistManager.h b/src/os/bluestore/ZonedFreelistManager.h
index 9e01dcbe487d..a74a06a00f26 100644
--- a/src/os/bluestore/ZonedFreelistManager.h
+++ b/src/os/bluestore/ZonedFreelistManager.h
@@ -102,9 +102,9 @@ public:
 		std::vector<std::pair<string, string>>*) const override;
 
   std::vector<zone_state_t> get_zone_states(KeyValueDB *kvdb) const;
-  void mark_zones_to_clean_free(const std::set<uint64_t> *zones_to_clean, 
+  void mark_zones_to_clean_free(const std::set<uint64_t>& zones_to_clean, 
 				KeyValueDB *kvdb);
-  void mark_zones_to_clean_in_progress(const std::set<uint64_t> *zones_to_clean,
+  void mark_zones_to_clean_in_progress(const std::set<uint64_t>& zones_to_clean,
 				       KeyValueDB *kvdb);
 };
 
-- 
2.47.3