All of lore.kernel.org
 help / color / mirror / Atom feed
From: Sagi Grimberg <sagi@grimberg.me>
To: linux-nvme@lists.infradead.org, linux-block@vger.kernel.org,
	Omar Sandoval <osandov@osandov.com>
Cc: Chaitanya Kulkarni <Chaitanya.Kulkarni@wdc.com>,
	Christoph Hellwig <hch@lst.de>, Keith Busch <kbusch@kernel.org>,
	Bart Van Assche <bvanassche@acm.org>
Subject: [PATCH v3 6/7] common: move module_unload to common
Date: Tue, 11 Aug 2020 14:01:01 -0700	[thread overview]
Message-ID: <20200811210102.194287-7-sagi@grimberg.me> (raw)
In-Reply-To: <20200811210102.194287-1-sagi@grimberg.me>

It creates a dependency between multipath-over-rdma
and test/nvmeof/rc which is not a natural home
for it. Move it to common helpers.

Signed-off-by: Sagi Grimberg <sagi@grimberg.me>
---
 common/rc          | 13 +++++++++++++
 tests/nvmeof-mp/rc | 13 -------------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/common/rc b/common/rc
index 7f02103dc786..cdc0150ea5ea 100644
--- a/common/rc
+++ b/common/rc
@@ -291,3 +291,16 @@ _filter_xfs_io_error() {
 _uptime_s() {
 	awk '{ print int($1) }' /proc/uptime
 }
+
+# Arguments: module to unload ($1) and retry count ($2).
+unload_module() {
+	local i m=$1 rc=${2:-1}
+
+	[ ! -e "/sys/module/$m" ] && return 0
+	for ((i=rc;i>0;i--)); do
+		modprobe -r "$m"
+		[ ! -e "/sys/module/$m" ] && return 0
+		sleep .1
+	done
+	return 1
+}
diff --git a/tests/nvmeof-mp/rc b/tests/nvmeof-mp/rc
index e446db297ba1..829b26624b7f 100755
--- a/tests/nvmeof-mp/rc
+++ b/tests/nvmeof-mp/rc
@@ -145,19 +145,6 @@ remove_mpath_devs() {
 	} &>> "$FULL"
 }
 
-# Arguments: module to unload ($1) and retry count ($2).
-unload_module() {
-	local i m=$1 rc=${2:-1}
-
-	[ ! -e "/sys/module/$m" ] && return 0
-	for ((i=rc;i>0;i--)); do
-		modprobe -r "$m"
-		[ ! -e "/sys/module/$m" ] && return 0
-		sleep .1
-	done
-	return 1
-}
-
 start_nvme_client() {
 	modprobe nvme-core dyndbg=+pmf &&
 		modprobe nvme dyndbg=+pmf &&
-- 
2.25.1


WARNING: multiple messages have this Message-ID (diff)
From: Sagi Grimberg <sagi@grimberg.me>
To: linux-nvme@lists.infradead.org, linux-block@vger.kernel.org,
	Omar Sandoval <osandov@osandov.com>
Cc: Keith Busch <kbusch@kernel.org>, Christoph Hellwig <hch@lst.de>,
	Chaitanya Kulkarni <Chaitanya.Kulkarni@wdc.com>,
	Bart Van Assche <bvanassche@acm.org>
Subject: [PATCH v3 6/7] common: move module_unload to common
Date: Tue, 11 Aug 2020 14:01:01 -0700	[thread overview]
Message-ID: <20200811210102.194287-7-sagi@grimberg.me> (raw)
In-Reply-To: <20200811210102.194287-1-sagi@grimberg.me>

It creates a dependency between multipath-over-rdma
and test/nvmeof/rc which is not a natural home
for it. Move it to common helpers.

Signed-off-by: Sagi Grimberg <sagi@grimberg.me>
---
 common/rc          | 13 +++++++++++++
 tests/nvmeof-mp/rc | 13 -------------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/common/rc b/common/rc
index 7f02103dc786..cdc0150ea5ea 100644
--- a/common/rc
+++ b/common/rc
@@ -291,3 +291,16 @@ _filter_xfs_io_error() {
 _uptime_s() {
 	awk '{ print int($1) }' /proc/uptime
 }
+
+# Arguments: module to unload ($1) and retry count ($2).
+unload_module() {
+	local i m=$1 rc=${2:-1}
+
+	[ ! -e "/sys/module/$m" ] && return 0
+	for ((i=rc;i>0;i--)); do
+		modprobe -r "$m"
+		[ ! -e "/sys/module/$m" ] && return 0
+		sleep .1
+	done
+	return 1
+}
diff --git a/tests/nvmeof-mp/rc b/tests/nvmeof-mp/rc
index e446db297ba1..829b26624b7f 100755
--- a/tests/nvmeof-mp/rc
+++ b/tests/nvmeof-mp/rc
@@ -145,19 +145,6 @@ remove_mpath_devs() {
 	} &>> "$FULL"
 }
 
-# Arguments: module to unload ($1) and retry count ($2).
-unload_module() {
-	local i m=$1 rc=${2:-1}
-
-	[ ! -e "/sys/module/$m" ] && return 0
-	for ((i=rc;i>0;i--)); do
-		modprobe -r "$m"
-		[ ! -e "/sys/module/$m" ] && return 0
-		sleep .1
-	done
-	return 1
-}
-
 start_nvme_client() {
 	modprobe nvme-core dyndbg=+pmf &&
 		modprobe nvme dyndbg=+pmf &&
-- 
2.25.1


_______________________________________________
Linux-nvme mailing list
Linux-nvme@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-nvme

  parent reply	other threads:[~2020-08-11 21:01 UTC|newest]

Thread overview: 28+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-08-11 21:00 [PATCH v3 0/7] blktests: Add support to run nvme tests with tcp/rdma transports Sagi Grimberg
2020-08-11 21:00 ` Sagi Grimberg
2020-08-11 21:00 ` [PATCH v3 1/7] nvme: consolidate nvme requirements based on transport type Sagi Grimberg
2020-08-11 21:00   ` Sagi Grimberg
2020-08-13  2:44   ` Chaitanya Kulkarni
2020-08-13  2:44     ` Chaitanya Kulkarni
2020-08-11 21:00 ` [PATCH v3 2/7] nvme: consolidate some nvme-cli utility functions Sagi Grimberg
2020-08-11 21:00   ` Sagi Grimberg
2020-08-12 15:49   ` Logan Gunthorpe
2020-08-12 15:49     ` Logan Gunthorpe
2020-08-11 21:00 ` [PATCH v3 3/7] nvme: make tests transport type agnostic Sagi Grimberg
2020-08-11 21:00   ` Sagi Grimberg
2020-08-11 21:00 ` [PATCH v3 4/7] tests/nvme: restrict tests to specific transports Sagi Grimberg
2020-08-11 21:00   ` Sagi Grimberg
2020-08-11 21:01 ` [PATCH v3 5/7] nvme: support nvme-tcp when runinng tests Sagi Grimberg
2020-08-11 21:01   ` Sagi Grimberg
2020-08-13  2:42   ` Chaitanya Kulkarni
2020-08-13  2:42     ` Chaitanya Kulkarni
2020-08-11 21:01 ` Sagi Grimberg [this message]
2020-08-11 21:01   ` [PATCH v3 6/7] common: move module_unload to common Sagi Grimberg
2020-08-11 21:30   ` Bart Van Assche
2020-08-11 21:30     ` Bart Van Assche
2020-08-11 21:45     ` Sagi Grimberg
2020-08-11 21:45       ` Sagi Grimberg
2020-08-11 21:01 ` [PATCH v3 7/7] nvme: support rdma transport type Sagi Grimberg
2020-08-11 21:01   ` Sagi Grimberg
2020-08-13 11:01 ` [PATCH v3 0/7] blktests: Add support to run nvme tests with tcp/rdma transports Yi Zhang
2020-08-13 11:01   ` Yi Zhang

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200811210102.194287-7-sagi@grimberg.me \
    --to=sagi@grimberg.me \
    --cc=Chaitanya.Kulkarni@wdc.com \
    --cc=bvanassche@acm.org \
    --cc=hch@lst.de \
    --cc=kbusch@kernel.org \
    --cc=linux-block@vger.kernel.org \
    --cc=linux-nvme@lists.infradead.org \
    --cc=osandov@osandov.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.