iser-target: Align to generic logging helpers (ea8a1616) · Commits · 戴 / test

drivers/infiniband/ulp/isert/ib_isert.c

+13 −6

Original line number	Original line	Diff line number	Diff line
	@@ -78,7 +78,9 @@ isert_qp_event_callback(struct ib_event e, void context)
	{		{
	struct isert_conn *isert_conn = context;		struct isert_conn *isert_conn = context;

	isert_err("conn %p event: %d\n", isert_conn, e->event);		isert_err("%s (%d): conn %p\n",
			ib_event_msg(e->event), e->event, isert_conn);

	switch (e->event) {		switch (e->event) {
	case IB_EVENT_COMM_EST:		case IB_EVENT_COMM_EST:
	rdma_notify(isert_conn->cm_id, IB_EVENT_COMM_EST);		rdma_notify(isert_conn->cm_id, IB_EVENT_COMM_EST);
	@@ -897,7 +899,8 @@ static int
	isert_np_cma_handler(struct isert_np *isert_np,		isert_np_cma_handler(struct isert_np *isert_np,
	enum rdma_cm_event_type event)		enum rdma_cm_event_type event)
	{		{
	isert_dbg("isert np %p, handling event %d\n", isert_np, event);		isert_dbg("%s (%d): isert np %p\n",
			rdma_event_msg(event), event, isert_np);

	switch (event) {		switch (event) {
	case RDMA_CM_EVENT_DEVICE_REMOVAL:		case RDMA_CM_EVENT_DEVICE_REMOVAL:
	@@ -957,7 +960,8 @@ isert_cma_handler(struct rdma_cm_id cma_id, struct rdma_cm_event event)
	{		{
	int ret = 0;		int ret = 0;

	isert_info("event %d status %d id %p np %p\n", event->event,		isert_info("%s (%d): status %d id %p np %p\n",
			rdma_event_msg(event->event), event->event,
	event->status, cma_id, cma_id->context);		event->status, cma_id, cma_id->context);

	switch (event->event) {		switch (event->event) {
	@@ -2091,10 +2095,13 @@ isert_handle_wc(struct ib_wc *wc)
	}		}
	} else {		} else {
	if (wc->status != IB_WC_WR_FLUSH_ERR)		if (wc->status != IB_WC_WR_FLUSH_ERR)
	isert_err("wr id %llx status %d vend_err %x\n",		isert_err("%s (%d): wr id %llx vend_err %x\n",
	wc->wr_id, wc->status, wc->vendor_err);		ib_wc_status_msg(wc->status), wc->status,
			wc->wr_id, wc->vendor_err);
	else		else
	isert_dbg("flush error: wr id %llx\n", wc->wr_id);		isert_dbg("%s (%d): wr id %llx\n",
			ib_wc_status_msg(wc->status), wc->status,
			wc->wr_id);

	if (wc->wr_id != ISER_FASTREG_LI_WRID)		if (wc->wr_id != ISER_FASTREG_LI_WRID)
	isert_cq_comp_err(isert_conn, wc);		isert_cq_comp_err(isert_conn, wc);

Admin message