From: Keith Busch <keith.busch@intel.com>
To: linux-nvdimm@lists.01.org, Vishal Verma <vishal.l.verma@intel.com>
Subject: [ndctl PATCH] ndctl: Suppress command errors if fallback exists
Date: Thu, 6 Sep 2018 12:58:48 -0600 [thread overview]
Message-ID: <20180906185848.31198-1-keith.busch@intel.com> (raw)
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 <keith.busch@intel.com>
---
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
next reply other threads:[~2018-09-06 18:57 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-09-06 18:58 Keith Busch [this message]
2018-09-06 21:58 ` [ndctl PATCH] ndctl: Suppress command errors if fallback exists Verma, Vishal L
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180906185848.31198-1-keith.busch@intel.com \
--to=keith.busch@intel.com \
--cc=linux-nvdimm@lists.01.org \
--cc=vishal.l.verma@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).