From patchwork Tue Feb 19 23:28:21 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chaitanya Kulkarni X-Patchwork-Id: 10820895 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id C5EF0188E for ; Tue, 19 Feb 2019 23:50:44 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B42F82C455 for ; Tue, 19 Feb 2019 23:50:44 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A89592D34C; Tue, 19 Feb 2019 23:50:44 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.4 required=2.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI,RCVD_IN_RP_RNBL autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5A5722D32A for ; Tue, 19 Feb 2019 23:50:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728820AbfBSXun (ORCPT ); Tue, 19 Feb 2019 18:50:43 -0500 Received: from esa1.hgst.iphmx.com ([68.232.141.245]:8491 "EHLO esa1.hgst.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726405AbfBSXun (ORCPT ); Tue, 19 Feb 2019 18:50:43 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1550620243; x=1582156243; h=from:to:cc:subject:date:message-id:in-reply-to: references; bh=c6usQqzDVM1Wioj2ys5GceWCZ10w3XB69rk7+T5WlVw=; b=WIo/STNA0I+63xe5eNw5uNlXTVYBv12ikRhxUIL1Vv4EmJXjmEXXAk/7 5t6x43zXQiw3jcg7RxViqQVGHePTMl42OEvb1gLnhdiWzky9JD3gDxAFm 4iwRHjVm78U/XYg+tykLkNjOogGzxmhUHbRL+jUxHgwycbiZZlChmU0En GM/B+esCk8S/AaHHQPlu/8dpQ6HbcLVgtvkCVC79/kMpIXNX8n5q8eEpJ +vQQU2YOz1XehveEKYgPL/l78M14gI/vKzpfsUGYpWKFbL3BcgQIVo0Z0 FCky3iNxi6PkzU2XalMKypCAqfuuy+l3BEY8ZjW5YztCScylS6dVUvKVP Q==; X-IronPort-AV: E=Sophos;i="5.58,388,1544457600"; d="scan'208";a="206871433" Received: from uls-op-cesaip01.wdc.com (HELO uls-op-cesaep01.wdc.com) ([199.255.45.14]) by ob1.hgst.iphmx.com with ESMTP; 20 Feb 2019 07:28:50 +0800 Received: from uls-op-cesaip01.wdc.com ([10.248.3.36]) by uls-op-cesaep01.wdc.com with ESMTP; 19 Feb 2019 15:07:14 -0800 Received: from cmercuryqemu.hgst.com ([10.202.65.32]) by uls-op-cesaip01.wdc.com with ESMTP; 19 Feb 2019 15:28:51 -0800 From: Chaitanya Kulkarni To: linux-block@vger.kernel.org Cc: osandov@osandov.com, bvanassche@acm.org, Chaitanya Kulkarni Subject: [PATCH 4/8] nvme/024: use consistent coding style Date: Tue, 19 Feb 2019 15:28:21 -0800 Message-Id: <1550618905-4112-5-git-send-email-chaitanya.kulkarni@wdc.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1550618905-4112-1-git-send-email-chaitanya.kulkarni@wdc.com> References: <1550618905-4112-1-git-send-email-chaitanya.kulkarni@wdc.com> Sender: linux-block-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP --- tests/nvme/024 | 16 ++++++---------- tests/nvme/024.out | 1 - 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/tests/nvme/024 b/tests/nvme/024 index 313f778..4b33717 100755 --- a/tests/nvme/024 +++ b/tests/nvme/024 @@ -38,11 +38,13 @@ test() { cat "/sys/block/${nvmedev}n1/uuid" cat "/sys/block/${nvmedev}n1/wwid" - nvme smart-log "/dev/${nvmedev}" -n 1 > /dev/null 2>&1 - - rc=$? + if ! nvme smart-log "/dev/${nvmedev}" -n 1 > /dev/null 2>&1; then + echo "Test Failed" + else + echo "Test complete" + fi - nvme disconnect -n "${subsys_name}" + nvme disconnect -n "${subsys_name}" > /dev/null 2>&1 _remove_nvmet_subsystem_from_port "${port}" "${subsys_name}" _remove_nvmet_subsystem "${subsys_name}" @@ -52,10 +54,4 @@ test() { modprobe -r nvme-loop modprobe -r nvmet - - if [ $rc -ne 0 ]; then - echo "Test Failed" - else - echo "Test complete" - fi } diff --git a/tests/nvme/024.out b/tests/nvme/024.out index 737d22f..0b1a350 100644 --- a/tests/nvme/024.out +++ b/tests/nvme/024.out @@ -1,5 +1,4 @@ Running nvme/024 91fdba0d-f87b-4c25-b80f-db7be1418b9e uuid.91fdba0d-f87b-4c25-b80f-db7be1418b9e -NQN:blktests-subsystem-1 disconnected 1 controller(s) Test complete