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

blobcli: fixup error handling in dump_imp_open_cb()

Browse Source 
Change-Id: Ia7feebd39a023642b94bedbab4da8f3b2f09b245
Signed-off-by: Paul Luse <paul.e.luse@intel.com>
Reviewed-on: https://review.gerrithub.io/382904
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Tested-by: SPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: Daniel Verkamp <daniel.verkamp@intel.com>
This commit is contained in:
Paul Luse 2017-10-17 19:04:19 -07:00 committed by Jim Harris
parent e9a50eb8cc
commit 809dc4187e
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
examples/blob/cli/blobcli.c
View File

@ -683,8 +683,8 @@ dump_imp_open_cb(void *cb_arg, struct spdk_blob *blob, int bserrno)
cli_context->buff = spdk_dma_malloc(cli_context->page_size, cli_context->buff = spdk_dma_malloc(cli_context->page_size,
ALIGN_4K, NULL); ALIGN_4K, NULL);
if (cli_context->buff == NULL) { if (cli_context->buff == NULL) {
unload_bs(cli_context, "Error in allocating memory", printf("Error in allocating memory\n");
-ENOMEM); spdk_bs_md_close_blob(&cli_context->blob, close_cb, cli_context);
return; return;
} }
printf("Working"); printf("Working");
@ -692,6 +692,11 @@ dump_imp_open_cb(void *cb_arg, struct spdk_blob *blob, int bserrno)
cli_context->page_count = 0; cli_context->page_count = 0;
if (cli_context->action == CLI_DUMP) { if (cli_context->action == CLI_DUMP) {
cli_context->fp = fopen(cli_context->file, "w"); cli_context->fp = fopen(cli_context->file, "w");
if (cli_context->fp == NULL) {
printf("Error in opening file\n");
spdk_bs_md_close_blob(&cli_context->blob, close_cb, cli_context);
return;
}
/* read a page of data from the blob */ /* read a page of data from the blob */
spdk_bs_io_read_blob(cli_context->blob, cli_context->channel, spdk_bs_io_read_blob(cli_context->blob, cli_context->channel,
@ -699,6 +704,11 @@ dump_imp_open_cb(void *cb_arg, struct spdk_blob *blob, int bserrno)
NUM_PAGES, read_dump_cb, cli_context); NUM_PAGES, read_dump_cb, cli_context);
} else { } else {
cli_context->fp = fopen(cli_context->file, "r"); cli_context->fp = fopen(cli_context->file, "r");
if (cli_context->fp == NULL) {
printf("Error in opening file\n");
spdk_bs_md_close_blob(&cli_context->blob, close_cb, cli_context);
return;
}
/* get the filesize then rewind read a page of data from file */ /* get the filesize then rewind read a page of data from file */
fseek(cli_context->fp, 0L, SEEK_END); fseek(cli_context->fp, 0L, SEEK_END);