From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) (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 EF07221122E5C for ; Thu, 6 Sep 2018 11:57:20 -0700 (PDT) From: Keith Busch Subject: [ndctl PATCH] ndctl: Suppress command errors if fallback exists Date: Thu, 6 Sep 2018 12:58:48 -0600 Message-Id: <20180906185848.31198-1-keith.busch@intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: linux-nvdimm-bounces@lists.01.org Sender: "Linux-nvdimm" To: linux-nvdimm@lists.01.org, Vishal Verma List-ID: If a command has a fallback to handle an error, this patch will not emit an error message and instead let the handler report any errors. Signed-off-by: Keith Busch --- ndctl/lib/intel.c | 9 +++++++-- ndctl/lib/libndctl.c | 4 +++- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/ndctl/lib/intel.c b/ndctl/lib/intel.c index b1254bb..15c5d1a 100644 --- a/ndctl/lib/intel.c +++ b/ndctl/lib/intel.c @@ -64,15 +64,17 @@ static struct ndctl_cmd *alloc_intel_cmd(struct ndctl_dimm *dimm, static int intel_smart_handle_error(struct ndctl_cmd *cmd) { struct ndctl_dimm *dimm = cmd->dimm; + struct ndctl_bus *bus = cmd_to_bus(cmd); + struct ndctl_ctx *ctx = ndctl_bus_get_ctx(bus); char *path = NULL, shutdown_count[16] = {}; int fd, rc = cmd->status; if (!dimm) - return 0; + goto out; if (asprintf(&path, DEF_TMPFS_DIR "/%s/usc", ndctl_dimm_get_devname(dimm)) < 0) - return rc; + goto out; fd = open(path, O_RDONLY); if (fd < 0) @@ -88,6 +90,9 @@ static int intel_smart_handle_error(struct ndctl_cmd *cmd) close (fd); free_path: free(path); + out: + if (rc) + err(ctx, "failed: %s\n", strerror(errno)); return rc; } diff --git a/ndctl/lib/libndctl.c b/ndctl/lib/libndctl.c index 226a577..481b110 100644 --- a/ndctl/lib/libndctl.c +++ b/ndctl/lib/libndctl.c @@ -2753,7 +2753,9 @@ NDCTL_EXPORT int ndctl_cmd_submit(struct ndctl_cmd *cmd) fd = open(path, O_RDWR); if (fd < 0) { - err(ctx, "failed to open %s: %s\n", path, strerror(errno)); + if (!cmd->handle_error) + err(ctx, "failed to open %s: %s\n", path, + strerror(errno)); rc = -errno; goto out; } -- 2.14.4 _______________________________________________ Linux-nvdimm mailing list Linux-nvdimm@lists.01.org https://lists.01.org/mailman/listinfo/linux-nvdimm