bluestore: trim serial number

remove any non-alpha character appended at the end

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>

diff --git a/src/os/bluestore/NVMEDevice.cc b/src/os/bluestore/NVMEDevice.cc
index 32a3a04316ced6ae23ffae1dca7677eb5b9f65b6..410869d404ce308560f615e2f1420d724963bd1d 100644 (file)
--- a/src/os/bluestore/NVMEDevice.cc
+++ b/src/os/bluestore/NVMEDevice.cc
@@ -581,7 +581,7 @@ static bool probe_cb(void *cb_ctx, struct spdk_pci_device *pci_dev)
   }
 
   if (ctx->sn_tag.compare(string(serial_number, 16))) {
-    dout(0) << __func__ << " device serial number not match " << serial_number << dendl;
+    dout(0) << __func__ << " device serial number (" << ctx->sn_tag << ") not match " << serial_number << dendl;
     return false;
   }
 
@@ -795,6 +795,9 @@ int NVMEDevice::open(string p)
     derr << __func__ << " unable to read " << p << ": " << cpp_strerror(r) << dendl;
     return r;
   }
+  while (r > 0 && !isalpha(buf[r-1])) {
+    --r;
+  }
   serial_number = string(buf, r);
   r = manager.try_get(serial_number, &driver);
   if (r < 0) {