hardenedbsd/HardenedBSD
1
0
Fork 0
mirror of https://git.hardenedbsd.org/hardenedbsd/HardenedBSD.git synced 2024-11-14 22:32:30 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

nvmecontrol: Use NVMEF macro to construct fields

Browse Source 
Reviewed by:	imp
Sponsored by:	Chelsio Communications
Differential Revision:	https://reviews.freebsd.org/D43606
This commit is contained in:
John Baldwin 2024-01-29 11:01:46 -08:00
parent 5650bd3fe8
commit c68ec278de
1 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
sbin/nvmecontrol/ns.c
View File

@ -579,14 +579,12 @@ nscreate(const struct cmd *f, int argc, char *argv[])
/* Default to the first format, whatever it is. */
nsdata.flbas = 0;
if (create_opt.lbaf != NONE) {
nsdata.flbas |= (create_opt.lbaf &
NVME_NS_DATA_FLBAS_FORMAT_MASK)
<< NVME_NS_DATA_FLBAS_FORMAT_SHIFT;
nsdata.flbas |= NVMEF(NVME_NS_DATA_FLBAS_FORMAT,
create_opt.lbaf);
}
if (create_opt.mset != NONE) {
nsdata.flbas |= (create_opt.mset &
NVME_NS_DATA_FLBAS_EXTENDED_MASK)
<< NVME_NS_DATA_FLBAS_EXTENDED_SHIFT;
nsdata.flbas |= NVMEF(NVME_NS_DATA_FLBAS_EXTENDED,
create_opt.mset);
}
}
if (create_opt.dps != NONE) {
@ -595,22 +593,19 @@ nscreate(const struct cmd *f, int argc, char *argv[])
/* Default to protection disabled. */
nsdata.dps = 0;
if (create_opt.pi != NONE) {
nsdata.dps |= (create_opt.pi &
NVME_NS_DATA_DPS_MD_START_MASK)
<< NVME_NS_DATA_DPS_MD_START_SHIFT;
nsdata.dps |= NVMEF(NVME_NS_DATA_DPS_MD_START,
create_opt.pi);
}
if (create_opt.pil != NONE) {
nsdata.dps |= (create_opt.pil &
NVME_NS_DATA_DPS_PIT_MASK)
<< NVME_NS_DATA_DPS_PIT_SHIFT;
nsdata.dps |= NVMEF(NVME_NS_DATA_DPS_PIT,
create_opt.pil);
}
}
if (create_opt.nmic != NONE) {
nsdata.nmic = create_opt.nmic;
} else {
/* Allow namespaces sharing if Multi-Path I/O is supported. */
nsdata.nmic = cd.mic ? (NVME_NS_DATA_NMIC_MAY_BE_SHARED_MASK <<
NVME_NS_DATA_NMIC_MAY_BE_SHARED_SHIFT) : 0;
nsdata.nmic = NVMEF(NVME_NS_DATA_NMIC_MAY_BE_SHARED, !!cd.mic);
}
nvme_namespace_data_swapbytes(&nsdata);