From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.0 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id AF8FEC43461 for ; Thu, 3 Sep 2020 23:54:06 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 6D8C32078E for ; Thu, 3 Sep 2020 23:54:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728015AbgICXyF (ORCPT ); Thu, 3 Sep 2020 19:54:05 -0400 Received: from mail-wr1-f66.google.com ([209.85.221.66]:42842 "EHLO mail-wr1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725782AbgICXyE (ORCPT ); Thu, 3 Sep 2020 19:54:04 -0400 Received: by mail-wr1-f66.google.com with SMTP id c18so4919413wrm.9 for ; Thu, 03 Sep 2020 16:54:03 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=E4766iF8tGytH+Vfs6i3/U2RwWmzQyiBC+bGyaYv3Kg=; b=Kzc9eVbNvCNSB2oh4vDBorE4NEWz9Dh3+rpXE0VdXXoAt+XHNwHMV+m1Lt5LvkTReL y5lAxqmjrUZiAfHpXN2rw0gz2GZZq85KorVIHKD5dk3/Ze0z8SBhMbpD4cRiZl3mSFn7 8ndgzBkWF+F95kRbwFGhzLoOrzt5mOL7GUKQ+VfqhlTJYzGXoy0LFOG7Iwijw5jIbfcq UsUx4RGG2JN041hxo3jSD1be5+Xz88JT/+gml7q5CxS233n5zGrosM/ApXlrJ6uZhbAL x1oa+xO3Nmlt359ZVgl6urYDaqXn7PO2avenjCn5dPKB9XM+/S2uQurKNeSywcNIm8aH ZrsQ== X-Gm-Message-State: AOAM532/dqFWRZbbSU4XZWnYwyXW5WCbdXKMZH/u5u1MCQVjCjZs+3lR kxhA2FAPqsgLez/y+ea+RgDxPAx6tBRPDA== X-Google-Smtp-Source: ABdhPJz9wmNhEgElMHthJYRKXZb/0dVNl4i6PMis1ISMWyfAJycy+sQwiYvzl1r4Q9BtwymoHqNVpQ== X-Received: by 2002:adf:db88:: with SMTP id u8mr4752891wri.184.1599177242817; Thu, 03 Sep 2020 16:54:02 -0700 (PDT) Received: from localhost.localdomain ([2601:647:4802:9070:79a5:e112:bd7c:4b29]) by smtp.gmail.com with ESMTPSA id u17sm7024992wmm.4.2020.09.03.16.54.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 03 Sep 2020 16:54:02 -0700 (PDT) From: Sagi Grimberg To: linux-block@vger.kernel.org, Omar Sandoval Cc: linux-nvme@lists.infradead.org, Logan Gunthorpe , Chaitanya Kulkarni , Keith Busch , Christoph Hellwig Subject: [PATCH v7 6/7] common: move module_unload to common Date: Thu, 3 Sep 2020 16:53:36 -0700 Message-Id: <20200903235337.527880-7-sagi@grimberg.me> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200903235337.527880-1-sagi@grimberg.me> References: <20200903235337.527880-1-sagi@grimberg.me> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-block-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org 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 --- common/rc | 13 +++++++++++++ tests/nvmeof-mp/rc | 13 ------------- tests/srp/rc | 13 ------------- 3 files changed, 13 insertions(+), 26 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 b95adf047a2f..d7a7c878fb19 100755 --- 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 72a3bca3b44d..7fc094b8267f 100755 --- 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 $? -- 2.25.1