| Message ID | 20200707164635.31217-1-harish@linux.ibm.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [ndctl] infoblock: Make output mutually exclusive | expand |
On Tue, Jul 07, 2020 at 10:16:35PM +0530, Harish wrote: > Patch fixes checking output filter option (-o <file> or -c) of > write-infoblock command to be mutually exclusive. > > Signed-off-by: Harish <harish@linux.ibm.com> Looks reasonable to me. Reviewed-by: Ira Weiny <ira.weiny@intel.com> > --- > ndctl/namespace.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/ndctl/namespace.c b/ndctl/namespace.c > index 0550580..d3ade25 100644 > --- a/ndctl/namespace.c > +++ b/ndctl/namespace.c > @@ -440,7 +440,7 @@ static const char *parse_namespace_options(int argc, const char **argv, > rc = -EINVAL; > } > > - if (action == ACTION_WRITE_INFOBLOCK && (param.outfile || param.std_out) > + if (action == ACTION_WRITE_INFOBLOCK && (param.outfile && param.std_out) > && argc) { > error("specify only one of a namespace filter, --output, or --stdout\n"); > rc = -EINVAL; > -- > 2.26.2 > _______________________________________________ > Linux-nvdimm mailing list -- linux-nvdimm@lists.01.org > To unsubscribe send an email to linux-nvdimm-leave@lists.01.org
This patch can be dropped as the error specifies namespace filter also is mutually exclusive with these options, so this is not needed. The usage confused me as it portrays namespace filtering to be mandatory as opposed to the Documentation. Command line: usage: ndctl write-infoblock <namespace> [<options>] Sorry for the noise. - Harish On 7/7/20 10:16 PM, Harish wrote: > Patch fixes checking output filter option (-o <file> or -c) of > write-infoblock command to be mutually exclusive. > > Signed-off-by: Harish <harish@linux.ibm.com> > --- > ndctl/namespace.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/ndctl/namespace.c b/ndctl/namespace.c > index 0550580..d3ade25 100644 > --- a/ndctl/namespace.c > +++ b/ndctl/namespace.c > @@ -440,7 +440,7 @@ static const char *parse_namespace_options(int argc, const char **argv, > rc = -EINVAL; > } > > - if (action == ACTION_WRITE_INFOBLOCK && (param.outfile || param.std_out) > + if (action == ACTION_WRITE_INFOBLOCK && (param.outfile && param.std_out) > && argc) { > error("specify only one of a namespace filter, --output, or --stdout\n"); > rc = -EINVAL;
diff --git a/ndctl/namespace.c b/ndctl/namespace.c index 0550580..d3ade25 100644 --- a/ndctl/namespace.c +++ b/ndctl/namespace.c @@ -440,7 +440,7 @@ static const char *parse_namespace_options(int argc, const char **argv, rc = -EINVAL; } - if (action == ACTION_WRITE_INFOBLOCK && (param.outfile || param.std_out) + if (action == ACTION_WRITE_INFOBLOCK && (param.outfile && param.std_out) && argc) { error("specify only one of a namespace filter, --output, or --stdout\n"); rc = -EINVAL;
Patch fixes checking output filter option (-o <file> or -c) of write-infoblock command to be mutually exclusive. Signed-off-by: Harish <harish@linux.ibm.com> --- ndctl/namespace.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)