aboutsummaryrefslogtreecommitdiff
path: root/sbin/nvmecontrol/resv.c
diff options
context:
space:
mode:
Diffstat (limited to 'sbin/nvmecontrol/resv.c')
-rw-r--r--sbin/nvmecontrol/resv.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/sbin/nvmecontrol/resv.c b/sbin/nvmecontrol/resv.c
index adb3b64c9ec3..d607b0b015e6 100644
--- a/sbin/nvmecontrol/resv.c
+++ b/sbin/nvmecontrol/resv.c
@@ -1,5 +1,5 @@
/*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 2019 Alexander Motin <mav@FreeBSD.org>
*
@@ -25,9 +25,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
#include <sys/param.h>
#include <sys/ioccom.h>
@@ -255,6 +252,7 @@ resvacquire(const struct cmd *f, int argc, char *argv[])
memset(&pt, 0, sizeof(pt));
pt.cmd.opc = NVME_OPC_RESERVATION_ACQUIRE;
+ pt.cmd.nsid = htole32(nsid);
pt.cmd.cdw10 = htole32((acquire_opt.racqa & 7) |
(acquire_opt.rtype << 8));
pt.buf = &data;
@@ -293,6 +291,7 @@ resvregister(const struct cmd *f, int argc, char *argv[])
memset(&pt, 0, sizeof(pt));
pt.cmd.opc = NVME_OPC_RESERVATION_REGISTER;
+ pt.cmd.nsid = htole32(nsid);
pt.cmd.cdw10 = htole32((register_opt.rrega & 7) |
(register_opt.iekey << 3) | (register_opt.cptpl << 30));
pt.buf = &data;
@@ -330,6 +329,7 @@ resvrelease(const struct cmd *f, int argc, char *argv[])
memset(&pt, 0, sizeof(pt));
pt.cmd.opc = NVME_OPC_RESERVATION_RELEASE;
+ pt.cmd.nsid = htole32(nsid);
pt.cmd.cdw10 = htole32((release_opt.rrela & 7) |
(release_opt.rtype << 8));
pt.buf = &data;
@@ -369,6 +369,7 @@ resvreport(const struct cmd *f, int argc, char *argv[])
bzero(data, sizeof(data));
memset(&pt, 0, sizeof(pt));
pt.cmd.opc = NVME_OPC_RESERVATION_REPORT;
+ pt.cmd.nsid = htole32(nsid);
pt.cmd.cdw10 = htole32(sizeof(data) / 4 - 1);
pt.cmd.cdw11 = htole32(report_opt.eds); /* EDS */
pt.buf = &data;