Move common code from the different nvme_allocate_request functions into a
separate function. Sponsored by: Intel Suggested by: carl Reviewed by: carl
This commit is contained in:
parent
237d2019e5
commit
dd433dd0fb
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=248771
|
@ -463,22 +463,31 @@ nvme_single_map(void *arg, bus_dma_segment_t *seg, int nseg, int error)
|
||||||
*bus_addr = seg[0].ds_addr;
|
*bus_addr = seg[0].ds_addr;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static __inline struct nvme_request *
|
||||||
|
_nvme_allocate_request(nvme_cb_fn_t cb_fn, void *cb_arg)
|
||||||
|
{
|
||||||
|
struct nvme_request *req;
|
||||||
|
|
||||||
|
req = uma_zalloc(nvme_request_zone, M_NOWAIT | M_ZERO);
|
||||||
|
if (req != NULL) {
|
||||||
|
req->cb_fn = cb_fn;
|
||||||
|
req->cb_arg = cb_arg;
|
||||||
|
req->timeout = TRUE;
|
||||||
|
}
|
||||||
|
return (req);
|
||||||
|
}
|
||||||
|
|
||||||
static __inline struct nvme_request *
|
static __inline struct nvme_request *
|
||||||
nvme_allocate_request(void *payload, uint32_t payload_size, nvme_cb_fn_t cb_fn,
|
nvme_allocate_request(void *payload, uint32_t payload_size, nvme_cb_fn_t cb_fn,
|
||||||
void *cb_arg)
|
void *cb_arg)
|
||||||
{
|
{
|
||||||
struct nvme_request *req;
|
struct nvme_request *req;
|
||||||
|
|
||||||
req = uma_zalloc(nvme_request_zone, M_NOWAIT | M_ZERO);
|
req = _nvme_allocate_request(cb_fn, cb_arg);
|
||||||
if (req == NULL)
|
if (req != NULL) {
|
||||||
return (NULL);
|
req->payload = payload;
|
||||||
|
req->payload_size = payload_size;
|
||||||
req->payload = payload;
|
}
|
||||||
req->payload_size = payload_size;
|
|
||||||
req->cb_fn = cb_fn;
|
|
||||||
req->cb_arg = cb_arg;
|
|
||||||
req->timeout = TRUE;
|
|
||||||
|
|
||||||
return (req);
|
return (req);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -487,15 +496,9 @@ nvme_allocate_request_uio(struct uio *uio, nvme_cb_fn_t cb_fn, void *cb_arg)
|
||||||
{
|
{
|
||||||
struct nvme_request *req;
|
struct nvme_request *req;
|
||||||
|
|
||||||
req = uma_zalloc(nvme_request_zone, M_NOWAIT | M_ZERO);
|
req = _nvme_allocate_request(cb_fn, cb_arg);
|
||||||
if (req == NULL)
|
if (req != NULL)
|
||||||
return (NULL);
|
req->uio = uio;
|
||||||
|
|
||||||
req->uio = uio;
|
|
||||||
req->cb_fn = cb_fn;
|
|
||||||
req->cb_arg = cb_arg;
|
|
||||||
req->timeout = TRUE;
|
|
||||||
|
|
||||||
return (req);
|
return (req);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user