From: Haomai Wang <haomai@xsky.com>
Date: Mon, 4 Jan 2016 16:04:14 +0000 (+0800)
Subject: NVMEDevice: remove unused variables
X-Git-Tag: v10.0.4~81^2~43
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=abb19d6833d2be666187abf5a312f303c7c706bd;p=ceph.git

NVMEDevice: remove unused variables

Signed-off-by: Haomai Wang <haomai@xsky.com>
---

diff --git a/src/os/bluestore/NVMEDevice.cc b/src/os/bluestore/NVMEDevice.cc
index 69ed36f95223..1c665353cb0e 100644
--- a/src/os/bluestore/NVMEDevice.cc
+++ b/src/os/bluestore/NVMEDevice.cc
@@ -21,12 +21,12 @@
 #include <fcntl.h>
 #include <unistd.h>
 
-#include "NVMEDevice.h"
 #include "include/types.h"
 #include "include/compat.h"
 #include "common/errno.h"
 #include "common/debug.h"
-#include "common/blkdev.h"
+
+#include "NVMEDevice.h"
 
 #define dout_subsys ceph_subsys_bdev
 #undef dout_prefix
@@ -87,24 +87,13 @@ int NVMEDevice::_lock()
   return 0;
 }
 
-struct nvme_whitelist {
-  const char *sn;
-  int id;
-};
-
 int NVMEDevice::open(string p)
 {
   int r = 0;
   dout(1) << __func__ << " path " << path << dendl;
 
-  config_section *sp;
   nvme_device *dev;
   pci_device *pci_dev;
-  const char *sn_tag, *id_tag, *val;
-  int id_tag_i, id = -1;
-  int i, num_whitelist_controllers = 0;
-  int controllers_remaining;
-  nvme_whitelist whitelist[NVME_MAX_CONTROLLERS];
 
   pci_system_init();
 
@@ -123,7 +112,6 @@ int NVMEDevice::open(string p)
   if (nvme_retry_count < 0)
     nvme_retry_count = NVME_DEFAULT_RETRY_COUNT;
 
-  /* Init the whitelist */
   string sn_tag = g_conf->bdev_nvme_serial_number;
   if (sn_tag.empty()) {
     int r = -ENOENT;