All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH v2 1/3] scsi: drop unlikely behind BUG_ON()
@ 2015-10-05 13:26 Geliang Tang
  2015-10-05 13:26 ` [PATCH v2 2/3] sched/core: " Geliang Tang
  0 siblings, 1 reply; 5+ messages in thread
From: Geliang Tang @ 2015-10-05 13:26 UTC (permalink / raw)
  To: James E.J. Bottomley; +Cc: Geliang Tang, linux-scsi, linux-kernel

(1) For !CONFIG_BUG cases, the bug call is a no-op, so we couldn't care
less and the change is ok.

(2) ppc and mips, which HAVE_ARCH_BUG_ON, do not rely on branch predictions
as it seems to be pointless[1] and thus callers should not be trying to
push an optimization in the first place.

(3) For CONFIG_BUG and !HAVE_ARCH_BUG_ON cases, BUG_ON() contains an
unlikely compiler flag already.

Hence, we can drop unlikely behind BUG_ON().

[1] http://lkml.iu.edu/hypermail/linux/kernel/1101.3/02289.html

Signed-off-by: Geliang Tang <geliangtang@163.com>
Reviewed-by: Bart Van Assche <bart.vanassche@sandisk.com>
---
Changes in v2:
 - Just rewrite the commit log.
---
 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 f570b48..3b5faab 100644
--- a/drivers/scsi/scsi_lib.c
+++ b/drivers/scsi/scsi_lib.c
@@ -1164,8 +1164,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.5.0



^ permalink raw reply related	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2015-10-06 16:18 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-10-05 13:26 [PATCH v2 1/3] scsi: drop unlikely behind BUG_ON() Geliang Tang
2015-10-05 13:26 ` [PATCH v2 2/3] sched/core: " Geliang Tang
2015-10-05 13:26   ` [PATCH v2 3/3] mm/nommu: " Geliang Tang
2015-10-05 13:26     ` Geliang Tang
2015-10-06 16:17   ` [tip:sched/core] sched/core: Drop " tip-bot for Geliang Tang

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.