filestore: remove unused 'filestore dev' option

Eons ago we would call mount/unmount on this, but it's been dead for a
while now.

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

diff --git a/src/common/config_opts.h b/src/common/config_opts.h
index 6485de124f5be494be5f1bb10c6096d07f39e98a..96757b384152dc844a2ed89b4368b06a7cc4559c 100644 (file)
--- a/src/common/config_opts.h
+++ b/src/common/config_opts.h
@@ -338,7 +338,6 @@ OPTION(filestore_max_inline_xattrs, OPT_U32, 2)
 
 OPTION(filestore_max_sync_interval, OPT_DOUBLE, 5)    // seconds
 OPTION(filestore_min_sync_interval, OPT_DOUBLE, .01)  // seconds
-OPTION(filestore_dev, OPT_STR, "")
 OPTION(filestore_btrfs_trans, OPT_BOOL, false)
 OPTION(filestore_btrfs_snap, OPT_BOOL, true)
 OPTION(filestore_btrfs_clone_range, OPT_BOOL, true)

diff --git a/src/os/FileStore.cc b/src/os/FileStore.cc
index 7e8f253b51139a06dcbbff26c1e419374c7fad75..5c76d494c04df74b8bc2f7b408dc36b8d226b709 100644 (file)
--- a/src/os/FileStore.cc
+++ b/src/os/FileStore.cc
@@ -688,7 +688,6 @@ FileStore::FileStore(const std::string &base, const std::string &jdev, const cha
   m_filestore_journal_parallel(g_conf->filestore_journal_parallel ),
   m_filestore_journal_trailing(g_conf->filestore_journal_trailing),
   m_filestore_journal_writeahead(g_conf->filestore_journal_writeahead),
-  m_filestore_dev(g_conf->filestore_dev),
   m_filestore_fiemap_threshold(g_conf->filestore_fiemap_threshold),
   m_filestore_sync_flush(g_conf->filestore_sync_flush),
   m_filestore_flusher_max_fds(g_conf->filestore_flusher_max_fds),
@@ -916,17 +915,6 @@ int FileStore::mkfs()
   memset(&volargs, 0, sizeof(volargs));
 #endif
 
-  if (!m_filestore_dev.empty()) {
-    dout(0) << "mounting" << dendl;
-    std::string mret = run_cmd("mount", m_filestore_dev.c_str(), (char*)NULL);
-    if (!mret.empty()) {
-      derr << "FileStore::mkfs: failed to mount m_filestore_dev "
-          << "'" << m_filestore_dev << "'. " << mret << dendl;
-      ret = -EIO;
-      goto out;
-    }
-  }
-
   dout(1) << "mkfs in " << basedir << dendl;
 
   snprintf(buf, sizeof(buf), "%s/fsid", basedir.c_str());
@@ -1120,12 +1108,6 @@ int FileStore::mkfs()
   if (ret)
     goto close_basedir_fd;
 
-  if (!m_filestore_dev.empty()) {
-    dout(0) << "umounting" << dendl;
-    snprintf(buf, sizeof(buf), "umount %s", m_filestore_dev.c_str());
-    //system(cmd);
-  }
-
   dout(1) << "mkfs done in " << basedir << dendl;
   ret = 0;
 
@@ -1637,11 +1619,6 @@ int FileStore::mount()
   uint64_t initial_op_seq;
   set<string> cluster_snaps;
 
-  if (!m_filestore_dev.empty()) {
-    dout(0) << "mounting" << dendl;
-    //run_cmd("mount", m_filestore_dev, (char*)NULL);
-  }
-
   dout(5) << "basedir " << basedir << " journal " << journalpath << dendl;
   
   // make sure global base dir exists
@@ -2071,11 +2048,6 @@ int FileStore::umount()
   }
   object_map.reset();
 
-  if (!m_filestore_dev.empty()) {
-    dout(0) << "umounting" << dendl;
-    //run_cmd("umount", m_filestore_dev, (char*)NULL);
-  }
-
   {
     Mutex::Locker l(sync_entry_timeo_lock);
     timer.shutdown();

diff --git a/src/os/FileStore.h b/src/os/FileStore.h
index a2279e96404fcea2f8b4d0b500e729cb9a3cb935..b06441cc839725026eac19363093e3ca4f7166c3 100644 (file)
--- a/src/os/FileStore.h
+++ b/src/os/FileStore.h
@@ -468,7 +468,6 @@ private:
   bool m_filestore_journal_parallel;
   bool m_filestore_journal_trailing;
   bool m_filestore_journal_writeahead;
-  std::string m_filestore_dev;
   int m_filestore_fiemap_threshold;
   bool m_filestore_sync_flush;
   int m_filestore_flusher_max_fds;