]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
os/bluestore/NVMEDevice: fix error handling for try_get()
authorxie xingguo <xie.xingguo@zte.com.cn>
Thu, 25 Feb 2016 11:03:49 +0000 (11:03 +0000)
committerxiexingguo <xie.xingguo@zte.com.cn>
Fri, 26 Feb 2016 11:06:14 +0000 (19:06 +0800)
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
src/os/bluestore/NVMEDevice.cc

index bb95a4938d1db52ccb5a932c6bdd245d2c5a204f..73a959c9178e22d81ce37405732960f6c94da9d3 100644 (file)
@@ -503,7 +503,8 @@ int NVMEManager::try_get(const string &sn_tag, SharedDriverData **driver)
 
   ProbeContext ctx = {sn_tag, this, nullptr};
   r = spdk_nvme_probe(&ctx, probe_cb, attach_cb);
-  if (r || !ctx.driver) {
+  if (r < 0) {
+    assert(!ctx.driver);
     derr << __func__ << " device probe nvme failed" << dendl;
     return r;
   }