From f9ac7dcf1148ff3f17167c21ec83d6876f042a89 Mon Sep 17 00:00:00 2001 From: Jim Harris Date: Fri, 22 Mar 2019 08:42:43 -0700 Subject: [PATCH] reduce: move code into _read_complete_req helper function This preps for some future changes. Signed-off-by: Jim Harris Change-Id: I380258938e2412062b43c3d460a7322c5afdf819 Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/449096 Tested-by: SPDK CI Jenkins Reviewed-by: Changpeng Liu Reviewed-by: Shuhei Matsumoto Reviewed-by: Paul Luse --- lib/reduce/reduce.c | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/lib/reduce/reduce.c b/lib/reduce/reduce.c index 3dad1169f..04c417e36 100644 --- a/lib/reduce/reduce.c +++ b/lib/reduce/reduce.c @@ -1026,13 +1026,27 @@ _write_read_done(void *_req, int reduce_errno) } static void -_read_read_done(void *_req, int reduce_errno) +_read_complete_req(void *_req, int reduce_errno) { struct spdk_reduce_vol_request *req = _req; uint64_t chunk_offset; uint8_t *buf; int i; + chunk_offset = req->offset % req->vol->logical_blocks_per_chunk; + buf = req->decomp_buf + chunk_offset * req->vol->params.logical_block_size; + for (i = 0; i < req->iovcnt; i++) { + memcpy(req->iov[i].iov_base, buf, req->iov[i].iov_len); + buf += req->iov[i].iov_len; + } + _reduce_vol_complete_req(req, 0); +} + +static void +_read_read_done(void *_req, int reduce_errno) +{ + struct spdk_reduce_vol_request *req = _req; + if (reduce_errno != 0) { req->reduce_errno = reduce_errno; } @@ -1047,13 +1061,7 @@ _read_read_done(void *_req, int reduce_errno) return; } - chunk_offset = req->offset % req->vol->logical_blocks_per_chunk; - buf = req->decomp_buf + chunk_offset * req->vol->params.logical_block_size; - for (i = 0; i < req->iovcnt; i++) { - memcpy(req->iov[i].iov_base, buf, req->iov[i].iov_len); - buf += req->iov[i].iov_len; - } - _reduce_vol_complete_req(req, 0); + _read_complete_req(req, 0); } static void