From: Logan Gunthorpe <logang@deltatee.com>
Date: Wed, 17 Jul 2019 17:12:59 +0000 (-0600)
Subject: nvme: Ignore errors when removing modules
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=a18a0d8b51abb152e2434f7f7cbf1720c42c07e9;p=users%2Fhch%2Fblktests.git

nvme: Ignore errors when removing modules

It is no longer important for correct test functionality to
remove the modules between tests. Therefore, we ignore errors
if the modules are not removed (ie. if they are builtin).

With this patch, it is now safe to run the tests with the nvmet
modules built-in. This will be more convienent for developers
that want to run the tests in a simple VM.

Reviewed-by: Johannes Thumshirn <jthumshirn@suse.de>
Signed-off-by: Logan Gunthorpe <logang@deltatee.com>
---

diff --git a/tests/nvme/rc b/tests/nvme/rc
index a6b4d59..348b4a3 100644
--- a/tests/nvme/rc
+++ b/tests/nvme/rc
@@ -68,8 +68,8 @@ _cleanup_nvmet() {
 	shopt -u nullglob
 	stty isig
 
-	modprobe -r nvme-loop
-	modprobe -r nvmet
+	modprobe -r nvme-loop 2>/dev/null
+	modprobe -r nvmet 2>/dev/null
 }
 
 _setup_nvmet() {