From 1c2d2e753a84c5248c09c6eba6298f34436c67f4 Mon Sep 17 00:00:00 2001 From: Paul Luse Date: Mon, 12 Nov 2018 16:52:08 -0700 Subject: [PATCH] bdev/crypto: respect return value of vbdev_crypto_claim() Found via inspection while invetigating a CI failure. In vbdev_crypto_examine() we were not looking at the rc from vbdev_crypto_claim() Change-Id: I8be09b5844e18e35b95f19e378fe280323d183fa Signed-off-by: Paul Luse Reviewed-on: https://review.gerrithub.io/432930 (master) Reviewed-on: https://review.gerrithub.io/435675 Tested-by: SPDK CI Jenkins Reviewed-by: Jim Harris Reviewed-by: Ben Walker Reviewed-by: Shuhei Matsumoto --- lib/bdev/crypto/vbdev_crypto.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/lib/bdev/crypto/vbdev_crypto.c b/lib/bdev/crypto/vbdev_crypto.c index 7367ecb23..6a77b225f 100644 --- a/lib/bdev/crypto/vbdev_crypto.c +++ b/lib/bdev/crypto/vbdev_crypto.c @@ -1507,7 +1507,7 @@ vbdev_crypto_claim(struct spdk_bdev *bdev) goto error_claim; } - SPDK_NOTICELOG("registered crypto_bdev for: %s\n", name->vbdev_name); + SPDK_NOTICELOG("registered io_device for: %s\n", name->vbdev_name); } return rc; @@ -1574,7 +1574,11 @@ vbdev_crypto_examine(struct spdk_bdev *bdev) struct vbdev_crypto *crypto_bdev, *tmp; int rc; - vbdev_crypto_claim(bdev); + rc = vbdev_crypto_claim(bdev); + if (rc) { + spdk_bdev_module_examine_done(&crypto_if); + return; + } TAILQ_FOREACH_SAFE(crypto_bdev, &g_vbdev_crypto, link, tmp) { if (strcmp(crypto_bdev->base_bdev->name, bdev->name) == 0) {