ib_srpt: Make compilation with BUG=n proceed
Subsystems (3)
PATCH 1/1 ib_srpt: Make compilation with BUG=n proceed
With CONFIG_BUG=n the __WARN() macro is not defined. Avoid that building with CONFIG_BUG=n fails by changing pr_err(...); _WARN() into WARN(true, ...).
Signed-off-by Bart Van Assche <[email protected]>
Cc Nicholas Bellinger <[email protected]>
Cc Roland Dreier <[email protected]>
Cc Christoph Hellwig <[email protected]>
Cc Randy Dunlap <rdunlap-/[email protected]>
Cc Stephen Rothwell <[email protected]>
--- drivers/infiniband/ulp/srpt/ib_srpt.c | 14 +++++--------- 1 files changed, 5 insertions(+), 9 deletions(-)
drivers/infiniband/ulp/srpt/ib_srpt.c +5 -9
@@ -1462,9 +1462,7 @@ static void srpt_handle_rdma_comp(struct srpt_rdma_ch *ch, }else if (opcode ==SRPT_RDMA_ABORT ) { ioctx->rdma_aborted = true; }else { -__WARN (); -printk (KERN_ERR "%s[%d]: scmnd == NULL (opcode %d)" , __func__, - __LINE__, opcode); +WARN (true,"unexpected opcode %d\n" , opcode); } }
@@ -2735,7 +2733,7 @@ static void srpt_cm_dreq_recv(struct ib_cm_id *cm_id)break ;case CH_DISCONNECTING :case CH_DRAINING : -__WARN (); +WARN (true,"unexpected channel state %d\n" , ch->state);break ; }spin_unlock_irqrestore (&ch->spinlock, flags);
@@ -2963,8 +2961,7 @@ static int srpt_write_pending(struct se_cmd *se_cmd) ch_state = ch->state;switch (ch_state) {case CH_CONNECTING : -/* This code should never be reached. */ -__WARN (); +WARN (true,"unexpected channel state %d\n" , ch_state); ret = -EINVAL ; goto out;case CH_LIVE :
@@ -3028,9 +3025,8 @@ static int srpt_queue_response(struct se_cmd *cmd) ioctx->state =SRPT_STATE_MGMT_RSP_SENT ;break ;default : -printk (KERN_ERR "ch %p; cmd %d: unexpected command state %d\n" , - ch, ioctx->ioctx.index, ioctx->state); -__WARN (); +WARN (true,"ch %p; cmd %d: unexpected command state %d\n" , + ch, ioctx->ioctx.index, ioctx->state);break ; }spin_unlock_irqrestore (&ioctx->spinlock, flags);
Signature · 6 lines
1.7.3.4 -- To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html