From dd433dd0fb9f8e6e4a734693c595d15df5ffb6b9 Mon Sep 17 00:00:00 2001 From: Jim Harris Date: Tue, 26 Mar 2013 22:13:07 +0000 Subject: [PATCH] Move common code from the different nvme_allocate_request functions into a separate function. Sponsored by: Intel Suggested by: carl Reviewed by: carl --- sys/dev/nvme/nvme_private.h | 41 ++++++++++++++++++++----------------- 1 file changed, 22 insertions(+), 19 deletions(-) diff --git a/sys/dev/nvme/nvme_private.h b/sys/dev/nvme/nvme_private.h index 8a43f26456d5..6a985997e8fa 100644 --- a/sys/dev/nvme/nvme_private.h +++ b/sys/dev/nvme/nvme_private.h @@ -463,22 +463,31 @@ nvme_single_map(void *arg, bus_dma_segment_t *seg, int nseg, int error) *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 * nvme_allocate_request(void *payload, uint32_t payload_size, 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) - return (NULL); - - req->payload = payload; - req->payload_size = payload_size; - req->cb_fn = cb_fn; - req->cb_arg = cb_arg; - req->timeout = TRUE; - + req = _nvme_allocate_request(cb_fn, cb_arg); + if (req != NULL) { + req->payload = payload; + req->payload_size = payload_size; + } 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; - req = uma_zalloc(nvme_request_zone, M_NOWAIT | M_ZERO); - if (req == NULL) - return (NULL); - - req->uio = uio; - req->cb_fn = cb_fn; - req->cb_arg = cb_arg; - req->timeout = TRUE; - + req = _nvme_allocate_request(cb_fn, cb_arg); + if (req != NULL) + req->uio = uio; return (req); }