common: move module_unload to common

It creates a dependency between multipath-over-rdma and test/nvmeof/rc
(and test/srp/rc) which is not a natural home for it.

Move it to common helpers.

Signed-off-by: Sagi Grimberg <sagi@grimberg.me>

diff --git a/common/rc b/common/rc
index 7f02103dc7863e84b832a111f7b7ea799e717ded..cdc0150ea5ea6a3c3ec1631fe88f34553e984782 100644 (file)
--- 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 b95adf047a2f6d64f29ce28bc10d05b4edadfd5d..d7a7c878fb197b7e42a010ba027bc5f7e55c1f81 100755 (executable)
--- a/tests/nvmeof-mp/rc
+++ b/tests/nvmeof-mp/rc
@@ -149,19 +149,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 &&

diff --git a/tests/srp/rc b/tests/srp/rc
index 72a3bca3b44d059498d416c8e0086e3c32746b82..7fc094b8267f4735f57a685be95eeeda6465e386 100755 (executable)
--- a/tests/srp/rc
+++ b/tests/srp/rc
@@ -321,19 +321,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
-}
-
 # Load the SRP initiator driver with kernel module parameters $1..$n.
 start_srp_ini() {
        modprobe scsi_transport_srp || return $?