Remove remaining uio-related code.
The nvme_physio() function was removed quite a while ago, which was the only user of this uio-related code. Sponsored by: Intel MFC after: 3 days
This commit is contained in:
parent
7b68ae1e5e
commit
bbd412dd05
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=252273
@ -145,7 +145,6 @@ struct nvme_request {
|
|||||||
struct nvme_qpair *qpair;
|
struct nvme_qpair *qpair;
|
||||||
union {
|
union {
|
||||||
void *payload;
|
void *payload;
|
||||||
struct uio *uio;
|
|
||||||
struct bio *bio;
|
struct bio *bio;
|
||||||
} u;
|
} u;
|
||||||
uint32_t type;
|
uint32_t type;
|
||||||
@ -469,8 +468,6 @@ int nvme_ns_construct(struct nvme_namespace *ns, uint16_t id,
|
|||||||
struct nvme_controller *ctrlr);
|
struct nvme_controller *ctrlr);
|
||||||
void nvme_ns_destruct(struct nvme_namespace *ns);
|
void nvme_ns_destruct(struct nvme_namespace *ns);
|
||||||
|
|
||||||
int nvme_ns_physio(struct cdev *dev, struct uio *uio, int ioflag);
|
|
||||||
|
|
||||||
void nvme_sysctl_initialize_ctrlr(struct nvme_controller *ctrlr);
|
void nvme_sysctl_initialize_ctrlr(struct nvme_controller *ctrlr);
|
||||||
|
|
||||||
void nvme_dump_command(struct nvme_command *cmd);
|
void nvme_dump_command(struct nvme_command *cmd);
|
||||||
@ -524,19 +521,6 @@ nvme_allocate_request_null(nvme_cb_fn_t cb_fn, void *cb_arg)
|
|||||||
return (req);
|
return (req);
|
||||||
}
|
}
|
||||||
|
|
||||||
static __inline struct nvme_request *
|
|
||||||
nvme_allocate_request_uio(struct uio *uio, nvme_cb_fn_t cb_fn, void *cb_arg)
|
|
||||||
{
|
|
||||||
struct nvme_request *req;
|
|
||||||
|
|
||||||
req = _nvme_allocate_request(cb_fn, cb_arg);
|
|
||||||
if (req != NULL) {
|
|
||||||
req->type = NVME_REQUEST_UIO;
|
|
||||||
req->u.uio = uio;
|
|
||||||
}
|
|
||||||
return (req);
|
|
||||||
}
|
|
||||||
|
|
||||||
static __inline struct nvme_request *
|
static __inline struct nvme_request *
|
||||||
nvme_allocate_request_bio(struct bio *bio, nvme_cb_fn_t cb_fn, void *cb_arg)
|
nvme_allocate_request_bio(struct bio *bio, nvme_cb_fn_t cb_fn, void *cb_arg)
|
||||||
{
|
{
|
||||||
|
@ -734,14 +734,6 @@ nvme_payload_map(void *arg, bus_dma_segment_t *seg, int nseg, int error)
|
|||||||
nvme_qpair_submit_tracker(tr->qpair, tr);
|
nvme_qpair_submit_tracker(tr->qpair, tr);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
|
||||||
nvme_payload_map_uio(void *arg, bus_dma_segment_t *seg, int nseg,
|
|
||||||
bus_size_t mapsize, int error)
|
|
||||||
{
|
|
||||||
|
|
||||||
nvme_payload_map(arg, seg, nseg, error);
|
|
||||||
}
|
|
||||||
|
|
||||||
static void
|
static void
|
||||||
_nvme_qpair_submit_request(struct nvme_qpair *qpair, struct nvme_request *req)
|
_nvme_qpair_submit_request(struct nvme_qpair *qpair, struct nvme_request *req)
|
||||||
{
|
{
|
||||||
@ -798,14 +790,6 @@ _nvme_qpair_submit_request(struct nvme_qpair *qpair, struct nvme_request *req)
|
|||||||
case NVME_REQUEST_NULL:
|
case NVME_REQUEST_NULL:
|
||||||
nvme_qpair_submit_tracker(tr->qpair, tr);
|
nvme_qpair_submit_tracker(tr->qpair, tr);
|
||||||
break;
|
break;
|
||||||
case NVME_REQUEST_UIO:
|
|
||||||
err = bus_dmamap_load_uio(tr->qpair->dma_tag,
|
|
||||||
tr->payload_dma_map, req->u.uio, nvme_payload_map_uio,
|
|
||||||
tr, 0);
|
|
||||||
if (err != 0)
|
|
||||||
nvme_printf(qpair->ctrlr,
|
|
||||||
"bus_dmamap_load_uio returned 0x%x!\n", err);
|
|
||||||
break;
|
|
||||||
#ifdef NVME_UNMAPPED_BIO_SUPPORT
|
#ifdef NVME_UNMAPPED_BIO_SUPPORT
|
||||||
case NVME_REQUEST_BIO:
|
case NVME_REQUEST_BIO:
|
||||||
KASSERT(req->u.bio->bio_bcount <= qpair->ctrlr->max_xfer_size,
|
KASSERT(req->u.bio->bio_bcount <= qpair->ctrlr->max_xfer_size,
|
||||||
|
Loading…
Reference in New Issue
Block a user