From: Sage Weil <sage@redhat.com>
Date: Thu, 4 Apr 2019 20:09:15 +0000 (-0500)
Subject: os/filestore: note devname for later use
X-Git-Tag: v15.1.0~3005^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=cef94b72b2f66346b51759ce07afed072e25582f;p=ceph.git

os/filestore: note devname for later use

This will generally happen early, before we see an EIO error and need it.

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

diff --git a/src/os/filestore/FileStore.cc b/src/os/filestore/FileStore.cc
index 9b0db2e4f473..12bbc5175f28 100644
--- a/src/os/filestore/FileStore.cc
+++ b/src/os/filestore/FileStore.cc
@@ -702,6 +702,7 @@ void FileStore::collect_metadata(map<string,string> *pm)
       (*pm)["backend_filestore_dev_node"] = "unknown";
     } else {
       (*pm)["backend_filestore_dev_node"] = string(dev_node);
+      devname = dev_node;
     }
     if (rc == 0 && vdo_fd >= 0) {
       (*pm)["vdo"] = "true";
diff --git a/src/os/filestore/FileStore.h b/src/os/filestore/FileStore.h
index f40a97689f85..d1faa8440f6a 100644
--- a/src/os/filestore/FileStore.h
+++ b/src/os/filestore/FileStore.h
@@ -160,6 +160,8 @@ private:
 
   void create_backend(unsigned long f_type);
 
+  string devname;
+
   int vdo_fd = -1;
   string vdo_name;