The branch stable/12 has been updated by mav: URL: https://cgit.FreeBSD.org/src/commit/?id=7a733b91aea1cfda109c255e7c052f9d56d14bc9
commit 7a733b91aea1cfda109c255e7c052f9d56d14bc9 Author: Alexander Motin <[email protected]> AuthorDate: 2021-07-14 19:46:22 +0000 Commit: Alexander Motin <[email protected]> CommitDate: 2021-07-21 01:57:07 +0000 Partially revert previous commit. ns identify does not allow nsid of 0xffffffff. Only general identify allows it. MFC after: 1 week (cherry picked from commit d1a0eab9fbc426ed8cbbddcd90720180c44ce36b) --- sbin/nvmecontrol/ns.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sbin/nvmecontrol/ns.c b/sbin/nvmecontrol/ns.c index 1da0cf01a69f..5ec6a305b8b9 100644 --- a/sbin/nvmecontrol/ns.c +++ b/sbin/nvmecontrol/ns.c @@ -331,7 +331,7 @@ static struct identify_options { .hex = false, .verbose = false, .dev = NULL, - .nsid = NONE - 1, + .nsid = NONE, }; static const struct opts identify_opts[] = { @@ -912,12 +912,12 @@ nsidentify(const struct cmd *f, int argc, char *argv[]) if (nsid != 0) { close(fd); open_dev(path, &fd, 1, 1); - } else if (identify_opt.nsid == NONE - 1) { + } else if (identify_opt.nsid == NONE) { close(fd); fprintf(stderr, "No NSID specified"); arg_help(argc, argv, f); } - if (identify_opt.nsid != NONE - 1) + if (identify_opt.nsid != NONE) nsid = identify_opt.nsid; if (read_controller_data(fd, &cd)) errx(EX_IOERR, "Identify request failed"); _______________________________________________ [email protected] mailing list https://lists.freebsd.org/mailman/listinfo/dev-commits-src-all To unsubscribe, send any mail to "[email protected]"
