From 415111ff9e1afbb7634a727ba92b3d11ae8e52cf Mon Sep 17 00:00:00 2001 From: Haomai Wang Date: Mon, 4 Jan 2016 22:13:31 +0800 Subject: [PATCH] NVMEDevice: use device name instead of path Signed-off-by: Haomai Wang --- src/os/bluestore/NVMEDevice.cc | 3 ++- src/os/bluestore/NVMEDevice.h | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/os/bluestore/NVMEDevice.cc b/src/os/bluestore/NVMEDevice.cc index b212dbbb1bd..7c70d6ef072 100644 --- a/src/os/bluestore/NVMEDevice.cc +++ b/src/os/bluestore/NVMEDevice.cc @@ -60,7 +60,7 @@ static void io_complete(void *ctx, const struct nvme_completion *completion) { // ---------------- #undef dout_prefix -#define dout_prefix *_dout << "bdev(" << path << ") " +#define dout_prefix *_dout << "bdev(" << name << ") " NVMEDevice::NVMEDevice(aio_callback_t cb, void *cbpriv) : aio_queue(g_conf->bdev_aio_max_queue_depth), @@ -217,6 +217,7 @@ int NVMEDevice::open(string p) assert(r == 0); r = _aio_start(); assert(r == 0); + name = pci_device_get_device_name(pci_dev); return 0; } diff --git a/src/os/bluestore/NVMEDevice.h b/src/os/bluestore/NVMEDevice.h index 74926c77c60..da6bcb2a8a8 100644 --- a/src/os/bluestore/NVMEDevice.h +++ b/src/os/bluestore/NVMEDevice.h @@ -34,6 +34,7 @@ class NVMEDevice : public BlockDevice { nvme_namespace *ns; uint64_t blocklen; int unbindfromkernel = 0; + string name; uint64_t size; uint64_t block_size; -- 2.47.3