diff -r 1fbb2025b263 sys/cam/nvme/nvme_da.c --- a/sys/cam/nvme/nvme_da.c Sun Dec 09 21:53:45 2018 +0000 +++ b/sys/cam/nvme/nvme_da.c Sun Dec 09 15:18:08 2018 -0800 @@ -798,7 +798,7 @@ disk->d_mediasize = (off_t)(disk->d_sectorsize * nsd->nsze); disk->d_delmaxsize = disk->d_mediasize; disk->d_flags = DISKFLAG_DIRECT_COMPLETION; -// if (cd->oncs.dsm) // XXX broken? + if ((cd->oncs >> NVME_CTRLR_DATA_ONCS_DSM_SHIFT) & NVME_CTRLR_DATA_ONCS_DSM_MASK) disk->d_flags |= DISKFLAG_CANDELETE; vwc_present = (cd->vwc >> NVME_CTRLR_DATA_VWC_PRESENT_SHIFT) & NVME_CTRLR_DATA_VWC_PRESENT_MASK;