From: Abutalib Aghayev <agayev@psu.edu>
Date: Tue, 22 Jun 2021 19:06:19 +0000 (-0400)
Subject: blk: Initialized zoned block device descriptor.
X-Git-Tag: v17.1.0~1525^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b36774d99c0bea37bfaf86856d5cbf04527c28be;p=ceph.git

blk: Initialized zoned block device descriptor.

Signed-off-by: Abutalib Aghayev <agayev@psu.edu>
---

diff --git a/src/blk/zoned/HMSMRDevice.cc b/src/blk/zoned/HMSMRDevice.cc
index 25d00bdbb759..045d690eaf6f 100644
--- a/src/blk/zoned/HMSMRDevice.cc
+++ b/src/blk/zoned/HMSMRDevice.cc
@@ -414,7 +414,7 @@ void HMSMRDevice::_detect_vdo()
 
 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) {
+    if (zbd_reset_zones(zbd_fd, 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 0efa78111bab..fd3ebf787106 100644
--- a/src/blk/zoned/HMSMRDevice.h
+++ b/src/blk/zoned/HMSMRDevice.h
@@ -41,7 +41,7 @@ class HMSMRDevice final : public BlockDevice {
   string vdo_name;
 
   std::string devname;  ///< kernel dev name (/sys/block/$devname), if any
-  int zbd_dev;
+  int zbd_fd = -1;	///< fd for the zoned block device
 
   ceph::mutex debug_lock = ceph::make_mutex("HMSMRDevice::debug_lock");
   interval_set<uint64_t> debug_inflight;