From patchwork Fri Aug 11 09:36:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Wagner X-Patchwork-Id: 134403 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b824:0:b0:3f2:4152:657d with SMTP id z4csp995914vqi; Fri, 11 Aug 2023 03:49:55 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEIZBOVV3SaXbnwhj4W7vdWNWfq3T9sw54921RtupfngiShOIX9WCudch5MhDoAitg9n9bN X-Received: by 2002:a17:906:2191:b0:999:37ff:be94 with SMTP id 17-20020a170906219100b0099937ffbe94mr1477195eju.71.1691750995492; Fri, 11 Aug 2023 03:49:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691750995; cv=none; d=google.com; s=arc-20160816; b=cZENf+0iOaBr4N0PKBrzxs/wXKHhNlpte1cjwk7ACS15Gx6RCBEugNo0xfXAJcRxPb xEC58oig3kAxX7XgD2jKrF7lg+K2vLHLZ1jRKCvM9Q6IwHd3amIfEmRNVf6PTU4Ph5mK BUKWqvJYlJ1BDXqvoMjHyUdjf5/Ge2pjdE5NPf8NNXFCSoK95iq6s+W2GWceOg5aJ3Dg aj1DzqoBFV8jsKSv30wFXOgZAi7MeqvG4fox6RIuh3xFtfKNfI9EHUR87gc/la6eL9Xw LH6dN1VzMxknyrm38d4FumjSO61cTjNkHfkQQZ4PaKrzZ5dbpIJiOEbNKje8jdBqGlxj a9+g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature:dkim-signature; bh=9RZ2Yzq36jl6W2j4gefEmERvFCX8trh+F8G0TYairgM=; fh=bV6KfuSN3hKC74ZszsAG29NNR6004wMeMm9n9bF0ols=; b=GPSRngIbmOLaWXDzrSwyO0bbD1Uin87QAn+vgD2tbMc/TXtObYji5nLHsONTPyHf13 5u4qt2oBimfm8ltExch+/NeYVrYksU+vGXBhA/iQz18tyG3atHMxQhVcxxjYZ8XXFa2w xmpny9JI9wkEAORZr9/JwNfZhP1bT4QdoQi47JrlF+ei8gV8uk/RGQj11D+bhm4TTpv4 Av78NuH9i5mCoHhnENOrvU6hB1KkN/JgA6r53A9HmO/v5tedcT7acIAjskW9xa+n2THo abFtV2Q+vmtvJJY/bIlRV0DwGkYVbjrzXcgvUEtqnX1wAeTaZiV5IXI8j7+VUAa/Oh3v f7VQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=LNefJHLT; dkim=neutral (no key) header.i=@suse.de; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=suse.de Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id jj4-20020a170907984400b00992f45c9342si2923903ejc.1020.2023.08.11.03.49.30; Fri, 11 Aug 2023 03:49:55 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=LNefJHLT; dkim=neutral (no key) header.i=@suse.de; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=suse.de Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235094AbjHKJg0 (ORCPT + 99 others); Fri, 11 Aug 2023 05:36:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51226 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235024AbjHKJgY (ORCPT ); Fri, 11 Aug 2023 05:36:24 -0400 Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.220.29]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7BD5B2709; Fri, 11 Aug 2023 02:36:22 -0700 (PDT) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id 014891F88C; Fri, 11 Aug 2023 09:36:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1691746581; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=9RZ2Yzq36jl6W2j4gefEmERvFCX8trh+F8G0TYairgM=; b=LNefJHLTw6qvD0/sVgJrnnhuY5PLgra9PQgYn2GWkc83OBfRU8v468a0mmMTLK1yktmlWy bB5s303ZAIoYJPpR8Ools4jyte7fvhrHMxIBzvwQGXLbDyeoQS6aDSZXUVrF8xEHRG1gP3 YwBeEC4NlBGijjHIj/coNT16FmO82MU= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1691746581; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=9RZ2Yzq36jl6W2j4gefEmERvFCX8trh+F8G0TYairgM=; b=YHw2WhnxHLDJZXMyAgPMW87o6lkmNo+HXSH3yzdzlg7VhVyIdgDCf3SaeBzGqoOMVWxbJj VtJ8w7t8IOLRV1DA== Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id C9DDB138E2; Fri, 11 Aug 2023 09:36:20 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id VzuMIhQB1mSaHwAAMHmgww (envelope-from ); Fri, 11 Aug 2023 09:36:20 +0000 From: Daniel Wagner To: linux-nvme@lists.infradead.org Cc: linux-kernel@vger.kernel.org, linux-block@vger.kernel.org, Chaitanya Kulkarni , Shin'ichiro Kawasaki , Max Gurtovoy , Hannes Reinecke , Sagi Grimberg , James Smart , Bart Van Assche , Daniel Wagner Subject: [PATCH blktests v3 01/13] nvme/{003,004,005,013,046,049}: Group all variables declarations Date: Fri, 11 Aug 2023 11:36:02 +0200 Message-ID: <20230811093614.28005-2-dwagner@suse.de> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230811093614.28005-1-dwagner@suse.de> References: <20230811093614.28005-1-dwagner@suse.de> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1773929492095945618 X-GMAIL-MSGID: 1773929492095945618 Group all variable declarations together at the beginning of the function. Many of the nvme tests do this but not all. Thus make these tests use the same style. This allows to spot the odd balls in the refactoring of the tests. Signed-off-by: Daniel Wagner --- tests/nvme/003 | 3 ++- tests/nvme/004 | 3 ++- tests/nvme/005 | 5 +++-- tests/nvme/013 | 1 - tests/nvme/046 | 1 + tests/nvme/049 | 1 + 6 files changed, 9 insertions(+), 5 deletions(-) diff --git a/tests/nvme/003 b/tests/nvme/003 index 6604012d2068..aa26abf8d8b3 100755 --- a/tests/nvme/003 +++ b/tests/nvme/003 @@ -22,10 +22,11 @@ test() { _setup_nvmet + local loop_dev local port + port="$(_create_nvmet_port "${nvme_trtype}")" - local loop_dev loop_dev="$(losetup -f)" _create_nvmet_subsystem "blktests-subsystem-1" "${loop_dev}" diff --git a/tests/nvme/004 b/tests/nvme/004 index cab98ff44326..1e5c2b8b3e87 100755 --- a/tests/nvme/004 +++ b/tests/nvme/004 @@ -23,11 +23,12 @@ test() { _setup_nvmet local port + local loop_dev + port="$(_create_nvmet_port "${nvme_trtype}")" truncate -s "${nvme_img_size}" "$TMPDIR/img" - local loop_dev loop_dev="$(losetup -f --show "$TMPDIR/img")" _create_nvmet_subsystem "blktests-subsystem-1" "${loop_dev}" \ diff --git a/tests/nvme/005 b/tests/nvme/005 index 8e15a13f3794..836854086822 100755 --- a/tests/nvme/005 +++ b/tests/nvme/005 @@ -22,11 +22,13 @@ test() { _setup_nvmet local port + local loop_dev + local nvmedev + port="$(_create_nvmet_port "${nvme_trtype}")" truncate -s "${nvme_img_size}" "$TMPDIR/img" - local loop_dev loop_dev="$(losetup -f --show "$TMPDIR/img")" _create_nvmet_subsystem "blktests-subsystem-1" "${loop_dev}" \ @@ -35,7 +37,6 @@ test() { _nvme_connect_subsys "${nvme_trtype}" blktests-subsystem-1 - local nvmedev nvmedev=$(_find_nvme_dev "blktests-subsystem-1") udevadm settle diff --git a/tests/nvme/013 b/tests/nvme/013 index 14e646a19c47..2be8681616d1 100755 --- a/tests/nvme/013 +++ b/tests/nvme/013 @@ -26,7 +26,6 @@ test() { local port local nvmedev local file_path="${TMPDIR}/img" - local subsys_name="blktests-subsystem-1" truncate -s "${nvme_img_size}" "${file_path}" diff --git a/tests/nvme/046 b/tests/nvme/046 index b37b9e98a559..942f25206c17 100755 --- a/tests/nvme/046 +++ b/tests/nvme/046 @@ -16,6 +16,7 @@ requires() { test_device() { echo "Running ${TEST_NAME}" + local ngdev=${TEST_DEV/nvme/ng} local perm nsid diff --git a/tests/nvme/049 b/tests/nvme/049 index f72862c6426d..599ab58d7a29 100755 --- a/tests/nvme/049 +++ b/tests/nvme/049 @@ -17,6 +17,7 @@ requires() { test_device() { echo "Running ${TEST_NAME}" + local ngdev=${TEST_DEV/nvme/ng} local common_args=( --size=1M