| Message ID | 20180906185848.31198-1-keith.busch@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [ndctl] ndctl: Suppress command errors if fallback exists | expand |
On Thu, 2018-09-06 at 12:58 -0600, Keith Busch wrote: > 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(-) Looks good, applied. > > 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; > }
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; }
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(-)