2018-08-31 20:18:18

by Igor Stoppa

Subject: [PATCH] infiniband: scsi: remove unnecessary unlikely()

WARN_ON() already contains an unlikely(), so it's not necessary to
wrap it into another.

Signed-off-by: Igor Stoppa <[email protected]>
Reviewed-by: Bart Van Assche <[email protected]>
Cc: [email protected] (open list:SCSI RDMA PROTOCOL (SRP) TARGET)
Cc: [email protected] (open list)
---
drivers/infiniband/ulp/srpt/ib_srpt.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/infiniband/ulp/srpt/ib_srpt.c b/drivers/infiniband/ulp/srpt/ib_srpt.c
index f37cbad022a2..447d21ea479a 100644
--- a/drivers/infiniband/ulp/srpt/ib_srpt.c
+++ b/drivers/infiniband/ulp/srpt/ib_srpt.c
@@ -2708,7 +2708,7 @@ static void srpt_queue_response(struct se_cmd *cmd)
break;
}

- if (unlikely(WARN_ON_ONCE(state == SRPT_STATE_CMD_RSP_SENT)))
+ if (WARN_ON_ONCE(state == SRPT_STATE_CMD_RSP_SENT))
return;

/* For read commands, transfer the data to the initiator. */
--
2.17.1

2018-09-05 21:54:46

by Jason Gunthorpe

Subject: Re: [PATCH] infiniband: scsi: remove unnecessary unlikely()

On Fri, Aug 31, 2018 at 11:16:45PM +0300, Igor Stoppa wrote:
> WARN_ON() already contains an unlikely(), so it's not necessary to
> wrap it into another.
>
> Signed-off-by: Igor Stoppa <[email protected]>
> Reviewed-by: Bart Van Assche <[email protected]>
> Cc: [email protected] (open list:SCSI RDMA PROTOCOL (SRP) TARGET)
> Cc: [email protected] (open list)
> ---
> drivers/infiniband/ulp/srpt/ib_srpt.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)

Applied to for-next, thanks

Jason