ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

reduce: rename vol->reqbufspace to buf_mem

Browse Source 
This matches better with the existing buf_iov_mem.

Signed-off-by: Jim Harris <james.r.harris@intel.com>
Change-Id: I3b85708672553c281666becc8eaf9f9028da8782

Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/449084
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: wuzhouhui <wuzhouhui@kingsoft.com>
Reviewed-by: Paul Luse <paul.e.luse@intel.com>
Reviewed-by: Changpeng Liu <changpeng.liu@intel.com>
This commit is contained in:
Jim Harris 2019-03-22 07:39:45 -07:00
parent 5a04099b01
commit 502ab5b66d
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lib/reduce/reduce.c
View File

@ -133,7 +133,7 @@ struct spdk_reduce_vol {
TAILQ_HEAD(, spdk_reduce_vol_request) queued_requests;
/* Single contiguous buffer used for all request buffers for this volume. */
uint8_t *reqbufspace;
uint8_t *buf_mem;
struct iovec *buf_iov_mem;
};
@ -306,15 +306,15 @@ _allocate_vol_requests(struct spdk_reduce_vol *vol)
struct spdk_reduce_vol_request *req;
int i;
vol->reqbufspace = spdk_dma_malloc(REDUCE_NUM_VOL_REQUESTS * vol->params.chunk_size, 64, NULL);
if (vol->reqbufspace == NULL) {
vol->buf_mem = spdk_dma_malloc(REDUCE_NUM_VOL_REQUESTS * vol->params.chunk_size, 64, NULL);
if (vol->buf_mem == NULL) {
return -ENOMEM;
}
vol->request_mem = calloc(REDUCE_NUM_VOL_REQUESTS, sizeof(*req));
if (vol->request_mem == NULL) {
spdk_dma_free(vol->reqbufspace);
vol->reqbufspace = NULL;
spdk_dma_free(vol->buf_mem);
vol->buf_mem = NULL;
return -ENOMEM;
}
@ -322,9 +322,9 @@ _allocate_vol_requests(struct spdk_reduce_vol *vol)
sizeof(struct iovec) * vol->backing_io_units_per_chunk);
if (vol->buf_iov_mem == NULL) {
free(vol->request_mem);
spdk_dma_free(vol->reqbufspace);
spdk_dma_free(vol->buf_mem);
vol->request_mem = NULL;
vol->reqbufspace = NULL;
vol->buf_mem = NULL;
return -ENOMEM;
}
@ -332,7 +332,7 @@ _allocate_vol_requests(struct spdk_reduce_vol *vol)
req = &vol->request_mem[i];
TAILQ_INSERT_HEAD(&vol->free_requests, req, tailq);
req->buf_iov = &vol->buf_iov_mem[i * vol->backing_io_units_per_chunk];
req->buf = vol->reqbufspace + i * vol->params.chunk_size;
req->buf = vol->buf_mem + i * vol->params.chunk_size;
}
return 0;
@ -353,7 +353,7 @@ _init_load_cleanup(struct spdk_reduce_vol *vol, struct reduce_init_load_ctx *ctx
spdk_bit_array_free(&vol->allocated_backing_io_units);
free(vol->request_mem);
free(vol->buf_iov_mem);
spdk_dma_free(vol->reqbufspace);
spdk_dma_free(vol->buf_mem);
free(vol);
}
}