From patchwork Wed Jul 26 12:46:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Wagner X-Patchwork-Id: 126357 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a985:0:b0:3e4:2afc:c1 with SMTP id t5csp403199vqo; Wed, 26 Jul 2023 06:28:34 -0700 (PDT) X-Google-Smtp-Source: APBJJlGUEs+w95ys7wV1hrk7+B/K0UkvXiTioWyhQ0vIRqgkxZLDaTmebVz7Y3VBD3Q2OgQv0oZF X-Received: by 2002:a17:906:846f:b0:994:4095:3abf with SMTP id hx15-20020a170906846f00b0099440953abfmr1474112ejc.14.1690378114515; Wed, 26 Jul 2023 06:28:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690378114; cv=none; d=google.com; s=arc-20160816; b=UFc/Ql6lC4pJkecmMl0aAYNxq2Xu2rx9h1TH2LdqKkS5gUECVJSg5VV+gR8GDdwNQa lvWU5uxy7sKcW9AeD2Q2pWP8uA7erasymXnc9P0RaJVqsGcnQqmER9TtmTUcfG2J/byq +ZGSdPlCcjGnOQVnYKn6IIe+ZLazG/w+mHaUQQb2UJlzKubJmJhj59FZnebJejSbBs0o yBPk7Tl2JmsJ4LiaPFpLm6hAjVJguzg4aqogHItV6baF0LC70JeyM2En/zFsXuueE3j+ VaQdS0S+pJYPcgG7CMiu1/wObNY0pwT43St623v2mFBnqLhkyk+eRkZTIWRjEIS04rBj Wxcw== 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=VPu1H25NivJSbCg/HOPZlHb/EYJ8Nwpyhat3/mx8rj4=; fh=yOxxhxcNlYDvRknRRq8NylD2QGGuF+oF8+pXpC2Qo68=; b=VmOY0V+ovjU+ULM0uZTzVvyb/CyRDPlScnLg+ZePootEc+6/AXFMtywXwtXeuAlzod udRw2dnGC88INWCwwyiKQXQlW2cu/eQ5sbBQWBRFEc89v2lzKTa9b8iila5D5VQsY5SP Kqg9c+lNDF0T5sVwm3Hoh1jGEJh9G1LVI5M+iz4bADbX7+aNuXuvZB851G6LDSH3vYFn QWDqs10sOd+T3bvY5/0KagEuxPt4auFqeimMEnpNekLqEXIImtNcreRq4ettN2byGstT 2s51wD9GchTOxHqkeirLQBYdxxbl9MGOsazc1VKlIw0yuFNZT/7D/LVuHt0XmLCDANMH pxDA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=Tn+yQogV; dkim=neutral (no key) header.i=@suse.de header.s=susede2_ed25519; 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 gy14-20020a170906f24e00b0098885a736easi9376496ejb.54.2023.07.26.06.28.09; Wed, 26 Jul 2023 06:28:34 -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=Tn+yQogV; dkim=neutral (no key) header.i=@suse.de header.s=susede2_ed25519; 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 S234361AbjGZMrI (ORCPT + 99 others); Wed, 26 Jul 2023 08:47:08 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49486 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232959AbjGZMrE (ORCPT ); Wed, 26 Jul 2023 08:47:04 -0400 Received: from smtp-out2.suse.de (smtp-out2.suse.de [IPv6:2001:67c:2178:6::1d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C5C3919A4; Wed, 26 Jul 2023 05:46:59 -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 B3A361F86C; Wed, 26 Jul 2023 12:46:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1690375612; 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=VPu1H25NivJSbCg/HOPZlHb/EYJ8Nwpyhat3/mx8rj4=; b=Tn+yQogVjjrExaH7TgBLRjyqSj/XHsYYh9U/orXU3Xhc+QFw51TNxPX8VNaSDescnI7GRo Qn4uoURcw1Yt+QocG+zLj2KiRHToPCA0ihLNUs5FRofBZ70u9GXd3fscRdIJ77Ik41d3Yu 0DXERg+BFPGQ842JF3e5W+9Zp6MHnF4= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1690375612; 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=VPu1H25NivJSbCg/HOPZlHb/EYJ8Nwpyhat3/mx8rj4=; b=WtmT96tCNeHhncXIO579hxODuA5CSGn5zBcmPhax6mZHhoRvy6gl15fB/45mcP1qN1fJ0E pKKxKZWUsmzS7gCw== 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 98862139BD; Wed, 26 Jul 2023 12:46:52 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id TBPuI7wVwWQgUAAAMHmgww (envelope-from ); Wed, 26 Jul 2023 12:46:52 +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 , Daniel Wagner Subject: [PATCH blktests v1 01/11] nvme/{003,004,005,013,046,049}: Group all variables declarations Date: Wed, 26 Jul 2023 14:46:34 +0200 Message-ID: <20230726124644.12619-2-dwagner@suse.de> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230726124644.12619-1-dwagner@suse.de> References: <20230726124644.12619-1-dwagner@suse.de> MIME-Version: 1.0 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE,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: 1772489921797398718 X-GMAIL-MSGID: 1772489921797398718 Group all variable declarations together at the beginning of the function. 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