Commit 6f1d8a53 authored Sep 05, 2018 by Igor Stoppa Committed by Martin K. Petersen Sep 17, 2018

scsi: core: remove unnecessary unlikely()

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

Signed-off-by: Igor Stoppa <igor.stoppa@huawei.com>
Cc: "Martin K. Petersen" <martin.petersen@oracle.com>
Cc: "James E.J. Bottomley" <jejb@linux.vnet.ibm.com>
Cc: linux-scsi@vger.kernel.org
CC: linux-kernel@vger.kernel.org
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

parent 5227388d

drivers/scsi/scsi_lib.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -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;

Admin message