From patchwork Sat Jan 12 01:30:33 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Verma, Vishal L" X-Patchwork-Id: 10760837 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 B87C791E for ; Sat, 12 Jan 2019 01:31:10 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AA5EE29F0B for ; Sat, 12 Jan 2019 01:31:10 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9E88529F1B; Sat, 12 Jan 2019 01:31:10 +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=-2.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from ml01.01.org (ml01.01.org [198.145.21.10]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 4F4EC29F0B for ; Sat, 12 Jan 2019 01:31:10 +0000 (UTC) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 666BE21CB74A4; Fri, 11 Jan 2019 17:31:07 -0800 (PST) X-Original-To: linux-nvdimm@lists.01.org Delivered-To: linux-nvdimm@lists.01.org Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=192.55.52.88; helo=mga01.intel.com; envelope-from=vishal.l.verma@intel.com; receiver=linux-nvdimm@lists.01.org Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 6BB65211A1E3B for ; Fri, 11 Jan 2019 17:31:06 -0800 (PST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga101.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 11 Jan 2019 17:31:02 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.56,467,1539673200"; d="scan'208";a="117481095" Received: from vverma7-desk1.lm.intel.com ([10.232.112.170]) by orsmga003.jf.intel.com with ESMTP; 11 Jan 2019 17:31:00 -0800 From: Vishal Verma To: Subject: [ndctl PATCH v2 2/4] ndctl, inject-smart: switch to ndctl_cmd_submit_xlat Date: Fri, 11 Jan 2019 18:30:33 -0700 Message-Id: <20190112013035.32087-3-vishal.l.verma@intel.com> X-Mailer: git-send-email 2.17.2 In-Reply-To: <20190112013035.32087-1-vishal.l.verma@intel.com> References: <20190112013035.32087-1-vishal.l.verma@intel.com> X-BeenThere: linux-nvdimm@lists.01.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Linux-nvdimm developer list." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Ami Pathak MIME-Version: 1.0 Errors-To: linux-nvdimm-bounces@lists.01.org Sender: "Linux-nvdimm" X-Virus-Scanned: ClamAV using ClamSMTP The ndctl inject-smart command was neglecting to check the 'firmware_status' field that is set by the platform firmware to indicate failure. Use the new ndctl_cmd_submit_xlat facility to include the firmware_status check as part of the command submission. Reported-by: Ami Pathak Cc: Dan Williams Signed-off-by: Vishal Verma --- ndctl/inject-smart.c | 16 ++++++++-------- ndctl/util/json-smart.c | 8 ++++---- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/ndctl/inject-smart.c b/ndctl/inject-smart.c index eaa137a..00c81b8 100644 --- a/ndctl/inject-smart.c +++ b/ndctl/inject-smart.c @@ -280,8 +280,8 @@ static int smart_set_thresh(struct ndctl_dimm *dimm) goto out; } - rc = ndctl_cmd_submit(st_cmd); - if (rc) { + rc = ndctl_cmd_submit_xlat(st_cmd); + if (rc < 0) { error("%s: smart threshold command failed: %s (%d)\n", name, strerror(abs(rc)), rc); goto out; @@ -320,8 +320,8 @@ static int smart_set_thresh(struct ndctl_dimm *dimm) ndctl_cmd_smart_threshold_set_alarm_control(sst_cmd, alarm); } - rc = ndctl_cmd_submit(sst_cmd); - if (rc) + rc = ndctl_cmd_submit_xlat(sst_cmd); + if (rc < 0) error("%s: smart set threshold command failed: %s (%d)\n", name, strerror(abs(rc)), rc); @@ -351,8 +351,8 @@ out: if (sctx.err_continue == false) \ goto out; \ } \ - rc = ndctl_cmd_submit(si_cmd); \ - if (rc) { \ + rc = ndctl_cmd_submit_xlat(si_cmd); \ + if (rc < 0) { \ error("%s: smart inject %s command failed: %s (%d)\n", \ name, #arg, strerror(abs(rc)), rc); \ if (sctx.err_continue == false) \ @@ -382,8 +382,8 @@ out: if (sctx.err_continue == false) \ goto out; \ } \ - rc = ndctl_cmd_submit(si_cmd); \ - if (rc) { \ + rc = ndctl_cmd_submit_xlat(si_cmd); \ + if (rc < 0) { \ error("%s: smart inject %s command failed: %s (%d)\n", \ name, #arg, strerror(abs(rc)), rc); \ if (sctx.err_continue == false) \ diff --git a/ndctl/util/json-smart.c b/ndctl/util/json-smart.c index 3c1b917..92a9313 100644 --- a/ndctl/util/json-smart.c +++ b/ndctl/util/json-smart.c @@ -30,8 +30,8 @@ static void smart_threshold_to_json(struct ndctl_dimm *dimm, if (!cmd) return; - rc = ndctl_cmd_submit(cmd); - if (rc || ndctl_cmd_get_firmware_status(cmd)) + rc = ndctl_cmd_submit_xlat(cmd); + if ((rc < 0) || ndctl_cmd_get_firmware_status(cmd)) goto out; alarm_control = ndctl_cmd_smart_threshold_get_alarm_control(cmd); @@ -115,8 +115,8 @@ struct json_object *util_dimm_health_to_json(struct ndctl_dimm *dimm) if (!cmd) goto err; - rc = ndctl_cmd_submit(cmd); - if (rc || ndctl_cmd_get_firmware_status(cmd)) { + rc = ndctl_cmd_submit_xlat(cmd); + if ((rc < 0) || ndctl_cmd_get_firmware_status(cmd)) { jobj = json_object_new_string("unknown"); if (jobj) json_object_object_add(jhealth, "health_state", jobj);