lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Fri, 31 Aug 2018 01:34:29 +0300 From: Igor Stoppa <igor.stoppa@...il.com> To: linux-kernel@...r.kernel.org Cc: igor.stoppa@...il.com, Igor Stoppa <igor.stoppa@...wei.com>, "Martin K. Petersen" <martin.petersen@...cle.com>, "James E.J. Bottomley" <jejb@...ux.vnet.ibm.com> Subject: [PATCH 23/23] scsi: remove unnecessary unlikely() BUG_ON() already contains an unlikely(), there is no need for another one. Signed-off-by: Igor Stoppa <igor.stoppa@...wei.com> Cc: "Martin K. Petersen" <martin.petersen@...cle.com> Cc: "James E.J. Bottomley" <jejb@...ux.vnet.ibm.com> --- 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
Powered by blists - more mailing lists