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

log: remove old-style errlog entries.

Browse Source 
SPDK_ERRLOG lists the function name, so remove old references that
assume it doesn't and reprint the function name.

Change-Id: I69da6ca0a25bf0eda07d8dad52bcfadf964ac715
Signed-off-by: Seth Howell <seth.howell@intel.com>
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/469487
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
This commit is contained in:
Seth Howell 2019-09-25 16:18:08 -07:00 committed by Jim Harris
parent e0e4f4ead6
commit 8a2527836d
8 changed files with 22 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/blob/blobstore.c
View File

@ -1803,7 +1803,7 @@ _spdk_blob_request_submit_op_split_next(void *cb_arg, int bserrno)
break; break;
case SPDK_BLOB_READV: case SPDK_BLOB_READV:
case SPDK_BLOB_WRITEV: case SPDK_BLOB_WRITEV:
SPDK_ERRLOG("readv/write not valid for %s\n", __func__); SPDK_ERRLOG("readv/write not valid\n");
spdk_bs_sequence_finish(ctx->seq, -EINVAL); spdk_bs_sequence_finish(ctx->seq, -EINVAL);
free(ctx); free(ctx);
break; break;

4
lib/env_dpdk/memory.c
View File

@ -1000,8 +1000,8 @@ spdk_vtophys_notify(void *cb_ctx, struct spdk_mem_map *map,
} }
if (((uintptr_t)vaddr & MASK_2MB) || (len & MASK_2MB)) { if (((uintptr_t)vaddr & MASK_2MB) || (len & MASK_2MB)) {
DEBUG_PRINT("invalid %s parameters, vaddr=%p len=%ju\n", DEBUG_PRINT("invalid parameters, vaddr=%p len=%ju\n",
__func__, vaddr, len); vaddr, len);
return -EINVAL; return -EINVAL;
} }

2
lib/net/interface.c
View File

@ -167,7 +167,7 @@ static int spdk_process_new_interface_msg(struct nlmsghdr *h)
ifc = (struct spdk_interface *) malloc(sizeof(*ifc)); ifc = (struct spdk_interface *) malloc(sizeof(*ifc));
if (ifc == NULL) { if (ifc == NULL) {
SPDK_ERRLOG("%s: Malloc failed\n", __func__); SPDK_ERRLOG("Malloc failed\n");
return 1; return 1;
} }

4
lib/nvme/nvme_ctrlr.c
View File

@ -674,7 +674,7 @@ nvme_ctrlr_enable(struct spdk_nvme_ctrlr *ctrlr)
} }
if (cc.bits.en != 0) { if (cc.bits.en != 0) {
SPDK_ERRLOG("%s called with CC.EN = 1\n", __func__); SPDK_ERRLOG("called with CC.EN = 1\n");
return -EINVAL; return -EINVAL;
} }
@ -986,7 +986,7 @@ spdk_nvme_ctrlr_reset(struct spdk_nvme_ctrlr *ctrlr)
while (ctrlr->state != NVME_CTRLR_STATE_READY) { while (ctrlr->state != NVME_CTRLR_STATE_READY) {
if (nvme_ctrlr_process_init(ctrlr) != 0) { if (nvme_ctrlr_process_init(ctrlr) != 0) {
SPDK_ERRLOG("%s: controller reinitialization failed\n", __func__); SPDK_ERRLOG("controller reinitialization failed\n");
nvme_ctrlr_fail(ctrlr, false); nvme_ctrlr_fail(ctrlr, false);
rc = -1; rc = -1;
break; break;

3
lib/nvme/nvme_pcie.c
View File

@ -639,8 +639,7 @@ nvme_pcie_ctrlr_free_cmb_io_buffer(struct spdk_nvme_ctrlr *ctrlr, void *buf, siz
* Do nothing for now. * Do nothing for now.
* TODO: Track free space so buffers may be reused. * TODO: Track free space so buffers may be reused.
*/ */
SPDK_ERRLOG("%s: no deallocation for CMB buffers yet!\n", SPDK_ERRLOG("no deallocation for CMB buffers yet!\n");
__func__);
return 0; return 0;
} }

18
lib/nvmf/fc.c
View File

@ -1208,7 +1208,7 @@ spdk_nvmf_fc_request_abort(struct spdk_nvmf_fc_request *fc_req, bool send_abts,
if (cb) { if (cb) {
ctx = calloc(1, sizeof(struct spdk_nvmf_fc_caller_ctx)); ctx = calloc(1, sizeof(struct spdk_nvmf_fc_caller_ctx));
if (!ctx) { if (!ctx) {
SPDK_ERRLOG("%s: ctx alloc failed.\n", __func__); SPDK_ERRLOG("ctx alloc failed.\n");
return; return;
} }
ctx->cb = cb; ctx->cb = cb;
@ -1263,7 +1263,7 @@ spdk_nvmf_fc_request_abort(struct spdk_nvmf_fc_request *fc_req, bool send_abts,
goto complete; goto complete;
} else { } else {
/* Should never happen */ /* Should never happen */
SPDK_ERRLOG("%s: Request in invalid state\n", __func__); SPDK_ERRLOG("Request in invalid state\n");
goto complete; goto complete;
} }
@ -1545,11 +1545,11 @@ spdk_nvmf_fc_hwqp_process_frame(struct spdk_nvmf_fc_hwqp *hwqp,
rc = nvmf_fc_hwqp_find_nport_and_rport(hwqp, d_id, &nport, s_id, &rport); rc = nvmf_fc_hwqp_find_nport_and_rport(hwqp, d_id, &nport, s_id, &rport);
if (rc) { if (rc) {
if (nport == NULL) { if (nport == NULL) {
SPDK_ERRLOG("%s: Nport not found. Dropping\n", __func__); SPDK_ERRLOG("Nport not found. Dropping\n");
/* increment invalid nport counter */ /* increment invalid nport counter */
hwqp->counters.nport_invalid++; hwqp->counters.nport_invalid++;
} else if (rport == NULL) { } else if (rport == NULL) {
SPDK_ERRLOG("%s: Rport not found. Dropping\n", __func__); SPDK_ERRLOG("Rport not found. Dropping\n");
/* increment invalid rport counter */ /* increment invalid rport counter */
hwqp->counters.rport_invalid++; hwqp->counters.rport_invalid++;
} }
@ -1558,7 +1558,7 @@ spdk_nvmf_fc_hwqp_process_frame(struct spdk_nvmf_fc_hwqp *hwqp,
if (nport->nport_state != SPDK_NVMF_FC_OBJECT_CREATED || if (nport->nport_state != SPDK_NVMF_FC_OBJECT_CREATED ||
rport->rport_state != SPDK_NVMF_FC_OBJECT_CREATED) { rport->rport_state != SPDK_NVMF_FC_OBJECT_CREATED) {
SPDK_ERRLOG("%s: %s state not created. Dropping\n", __func__, SPDK_ERRLOG("%s state not created. Dropping\n",
nport->nport_state != SPDK_NVMF_FC_OBJECT_CREATED ? nport->nport_state != SPDK_NVMF_FC_OBJECT_CREATED ?
"Nport" : "Rport"); "Nport" : "Rport");
return -EACCES; return -EACCES;
@ -1612,7 +1612,7 @@ spdk_nvmf_fc_hwqp_process_frame(struct spdk_nvmf_fc_hwqp *hwqp,
rc = nvmf_fc_hwqp_handle_request(hwqp, frame, buff_idx, buffer, plen); rc = nvmf_fc_hwqp_handle_request(hwqp, frame, buff_idx, buffer, plen);
} else { } else {
SPDK_ERRLOG("%s Unknown frame received. Dropping\n", __func__); SPDK_ERRLOG("Unknown frame received. Dropping\n");
hwqp->counters.unknown_frame++; hwqp->counters.unknown_frame++;
rc = -EINVAL; rc = -EINVAL;
} }
@ -1654,11 +1654,11 @@ spdk_nvmf_fc_hwqp_process_pending_ls_rqsts(struct spdk_nvmf_fc_hwqp *hwqp)
int rc = nvmf_fc_hwqp_find_nport_and_rport(hwqp, ls_rqst->d_id, &nport, ls_rqst->s_id, &rport); int rc = nvmf_fc_hwqp_find_nport_and_rport(hwqp, ls_rqst->d_id, &nport, ls_rqst->s_id, &rport);
if (rc) { if (rc) {
if (nport == NULL) { if (nport == NULL) {
SPDK_ERRLOG("%s: Nport not found. Dropping\n", __func__); SPDK_ERRLOG("Nport not found. Dropping\n");
/* increment invalid nport counter */ /* increment invalid nport counter */
hwqp->counters.nport_invalid++; hwqp->counters.nport_invalid++;
} else if (rport == NULL) { } else if (rport == NULL) {
SPDK_ERRLOG("%s: Rport not found. Dropping\n", __func__); SPDK_ERRLOG("Rport not found. Dropping\n");
/* increment invalid rport counter */ /* increment invalid rport counter */
hwqp->counters.rport_invalid++; hwqp->counters.rport_invalid++;
} }
@ -1669,7 +1669,7 @@ spdk_nvmf_fc_hwqp_process_pending_ls_rqsts(struct spdk_nvmf_fc_hwqp *hwqp)
} }
if (nport->nport_state != SPDK_NVMF_FC_OBJECT_CREATED || if (nport->nport_state != SPDK_NVMF_FC_OBJECT_CREATED ||
rport->rport_state != SPDK_NVMF_FC_OBJECT_CREATED) { rport->rport_state != SPDK_NVMF_FC_OBJECT_CREATED) {
SPDK_ERRLOG("%s: %s state not created. Dropping\n", __func__, SPDK_ERRLOG("%s state not created. Dropping\n",
nport->nport_state != SPDK_NVMF_FC_OBJECT_CREATED ? nport->nport_state != SPDK_NVMF_FC_OBJECT_CREATED ?
"Nport" : "Rport"); "Nport" : "Rport");
TAILQ_REMOVE(&hwqp->ls_pending_queue, ls_rqst, ls_pending_link); TAILQ_REMOVE(&hwqp->ls_pending_queue, ls_rqst, ls_pending_link);

6
lib/thread/thread.c
View File

@ -843,7 +843,7 @@ spdk_io_device_register(void *io_device, spdk_io_channel_create_cb create_cb,
thread = spdk_get_thread(); thread = spdk_get_thread();
if (!thread) { if (!thread) {
SPDK_ERRLOG("%s called from non-SPDK thread\n", __func__); SPDK_ERRLOG("called from non-SPDK thread\n");
assert(false); assert(false);
return; return;
} }
@ -919,7 +919,7 @@ spdk_io_device_unregister(void *io_device, spdk_io_device_unregister_cb unregist
thread = spdk_get_thread(); thread = spdk_get_thread();
if (!thread) { if (!thread) {
SPDK_ERRLOG("%s called from non-SPDK thread\n", __func__); SPDK_ERRLOG("called from non-SPDK thread\n");
assert(false); assert(false);
return; return;
} }
@ -1049,7 +1049,7 @@ _spdk_put_io_channel(void *arg)
thread = spdk_get_thread(); thread = spdk_get_thread();
if (!thread) { if (!thread) {
SPDK_ERRLOG("%s called from non-SPDK thread\n", __func__); SPDK_ERRLOG("called from non-SPDK thread\n");
assert(false); assert(false);
return; return;
} }

6
lib/trace/trace_flags.c
View File

@ -47,7 +47,7 @@ uint64_t
spdk_trace_get_tpoint_mask(uint32_t group_id) spdk_trace_get_tpoint_mask(uint32_t group_id)
{ {
if (group_id >= SPDK_TRACE_MAX_GROUP_ID) { if (group_id >= SPDK_TRACE_MAX_GROUP_ID) {
SPDK_ERRLOG("%s: invalid group ID %d\n", __func__, group_id); SPDK_ERRLOG("invalid group ID %d\n", group_id);
return 0ULL; return 0ULL;
} }
@ -58,7 +58,7 @@ void
spdk_trace_set_tpoints(uint32_t group_id, uint64_t tpoint_mask) spdk_trace_set_tpoints(uint32_t group_id, uint64_t tpoint_mask)
{ {
if (group_id >= SPDK_TRACE_MAX_GROUP_ID) { if (group_id >= SPDK_TRACE_MAX_GROUP_ID) {
SPDK_ERRLOG("%s: invalid group ID %d\n", __func__, group_id); SPDK_ERRLOG("invalid group ID %d\n", group_id);
return; return;
} }
@ -69,7 +69,7 @@ void
spdk_trace_clear_tpoints(uint32_t group_id, uint64_t tpoint_mask) spdk_trace_clear_tpoints(uint32_t group_id, uint64_t tpoint_mask)
{ {
if (group_id >= SPDK_TRACE_MAX_GROUP_ID) { if (group_id >= SPDK_TRACE_MAX_GROUP_ID) {
SPDK_ERRLOG("%s: invalid group ID %d\n", __func__, group_id); SPDK_ERRLOG("invalid group ID %d\n", group_id);
return; return;
} }