update ceph source to reef 18.1.2

[ceph.git] / ceph / src / common / blkdev.cc

diff --git a/ceph/src/common/blkdev.cc b/ceph/src/common/blkdev.cc
index b3047fc303782834c33de9328bb729635fae000d..6fc2965a19af2cfcbcb43794770c0b5808bc8194 100644 (file)
--- a/ceph/src/common/blkdev.cc
+++ b/ceph/src/common/blkdev.cc
@@ -338,95 +338,6 @@ void get_raw_devices(const std::string& in,
   }
 }
 
-int _get_vdo_stats_handle(const char *devname, std::string *vdo_name)
-{
-  int vdo_fd = -1;
-
-  // we need to go from the raw devname (e.g., dm-4) to the VDO volume name.
-  // currently the best way seems to be to look at /dev/mapper/* ...
-  std::string expect = std::string("../") + devname;  // expected symlink target
-  DIR *dir = ::opendir("/dev/mapper");
-  if (!dir) {
-    return -1;
-  }
-  struct dirent *de = nullptr;
-  while ((de = ::readdir(dir))) {
-    if (de->d_name[0] == '.')
-      continue;
-    char fn[4096], target[4096];
-    snprintf(fn, sizeof(fn), "/dev/mapper/%s", de->d_name);
-    int r = readlink(fn, target, sizeof(target));
-    if (r < 0 || r >= (int)sizeof(target))
-      continue;
-    target[r] = 0;
-    if (expect == target) {
-      snprintf(fn, sizeof(fn), "/sys/kvdo/%s/statistics", de->d_name);
-      vdo_fd = ::open(fn, O_RDONLY|O_CLOEXEC); //DIRECTORY);
-      if (vdo_fd >= 0) {
-       *vdo_name = de->d_name;
-       break;
-      }
-    }
-  }
-  closedir(dir);
-  return vdo_fd;
-}
-
-int get_vdo_stats_handle(const char *devname, std::string *vdo_name)
-{
-  std::set<std::string> devs = { devname };
-  while (!devs.empty()) {
-    std::string dev = *devs.begin();
-    devs.erase(devs.begin());
-    int fd = _get_vdo_stats_handle(dev.c_str(), vdo_name);
-    if (fd >= 0) {
-      // yay, it's vdo
-      return fd;
-    }
-    // ok, see if there are constituent devices
-    if (dev.find("dm-") == 0) {
-      get_dm_parents(dev, &devs);
-    }
-  }
-  return -1;
-}
-
-int64_t get_vdo_stat(int vdo_fd, const char *property)
-{
-  int64_t ret = 0;
-  int fd = ::openat(vdo_fd, property, O_RDONLY|O_CLOEXEC);
-  if (fd < 0) {
-    return 0;
-  }
-  char buf[1024];
-  int r = ::read(fd, buf, sizeof(buf) - 1);
-  if (r > 0) {
-    buf[r] = 0;
-    ret = atoll(buf);
-  }
-  TEMP_FAILURE_RETRY(::close(fd));
-  return ret;
-}
-
-bool get_vdo_utilization(int fd, uint64_t *total, uint64_t *avail)
-{
-  int64_t block_size = get_vdo_stat(fd, "block_size");
-  int64_t physical_blocks = get_vdo_stat(fd, "physical_blocks");
-  int64_t overhead_blocks_used = get_vdo_stat(fd, "overhead_blocks_used");
-  int64_t data_blocks_used = get_vdo_stat(fd, "data_blocks_used");
-  if (!block_size
-      || !physical_blocks
-      || !overhead_blocks_used
-      || !data_blocks_used) {
-    return false;
-  }
-  int64_t avail_blocks =
-    physical_blocks - overhead_blocks_used - data_blocks_used;
-  *total = block_size * physical_blocks;
-  *avail = block_size * avail_blocks;
-  return true;
-}
-
 std::string _decode_model_enc(const std::string& in)
 {
   auto v = boost::replace_all_copy(in, "\\x20", " ");
@@ -908,21 +819,6 @@ void get_raw_devices(const std::string& in,
 {
 }
 
-int get_vdo_stats_handle(const char *devname, std::string *vdo_name)
-{
-  return -1;
-}
-
-int64_t get_vdo_stat(int fd, const char *property)
-{
-  return 0;
-}
-
-bool get_vdo_utilization(int fd, uint64_t *total, uint64_t *avail)
-{
-  return false;
-}
-
 std::string get_device_id(const std::string& devname,
                          std::string *err)
 {
@@ -1083,21 +979,6 @@ void get_raw_devices(const std::string& in,
 {
 }
 
-int get_vdo_stats_handle(const char *devname, std::string *vdo_name)
-{
-  return -1;
-}
-
-int64_t get_vdo_stat(int fd, const char *property)
-{
-  return 0;
-}
-
-bool get_vdo_utilization(int fd, uint64_t *total, uint64_t *avail)
-{
-  return false;
-}
-
 std::string get_device_id(const std::string& devname,
                          std::string *err)
 {
@@ -1237,21 +1118,6 @@ void get_raw_devices(const std::string& in,
 {
 }
 
-int get_vdo_stats_handle(const char *devname, std::string *vdo_name)
-{
-  return -1;
-}
-
-int64_t get_vdo_stat(int fd, const char *property)
-{
-  return 0;
-}
-
-bool get_vdo_utilization(int fd, uint64_t *total, uint64_t *avail)
-{
-  return false;
-}
-
 std::string get_device_id(const std::string& devname,
                          std::string *err)
 {