2018-09-05 20:49:43

by Igor Stoppa

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

BUG_ON() already contains an unlikely(), there is no need for another one.

Signed-off-by: Igor Stoppa <[email protected]>
Cc: "Martin K. Petersen" <[email protected]>
Cc: "James E.J. Bottomley" <[email protected]>
Cc: [email protected]
CC: [email protected]
---
drivers/scsi/scsi_lib.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
index 0adfb3bce0fd..aaa1819b0a69 100644
--- a/drivers/scsi/scsi_lib.c
+++ b/drivers/scsi/scsi_lib.c
@@ -1207,8 +1207,8 @@ int scsi_init_io(struct scsi_cmnd *cmd)

count = blk_rq_map_integrity_sg(rq->q, rq->bio,
prot_sdb->table.sgl);
- BUG_ON(unlikely(count > ivecs));
- BUG_ON(unlikely(count > queue_max_integrity_segments(rq->q)));
+ BUG_ON(count > ivecs);
+ BUG_ON(count > queue_max_integrity_segments(rq->q));

cmd->prot_sdb = prot_sdb;
cmd->prot_sdb->table.nents = count;
--
2.17.1

2018-09-17 06:36:28

by Martin K. Petersen

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

Igor,

> BUG_ON() already contains an unlikely(), there is no need for another one.

Applied to 4.20/scsi-queue, thanks!

--
Martin K. Petersen Oracle Linux Engineering