From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753324Ab1CZRIo (ORCPT ); Sat, 26 Mar 2011 13:08:44 -0400 Received: from [123.120.158.88] ([123.120.158.88]:35154 "EHLO enigma.site" rhost-flags-FAIL-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1752325Ab1CZRIl (ORCPT ); Sat, 26 Mar 2011 13:08:41 -0400 From: Coly Li To: linux-kernel@vger.kernel.org Cc: Coly Li , James Bottomley , linux-scsi@vger.kernel.org Subject: [PATCH 4/4] scsi_lib.c: use BUG_ON correctly, v4 Date: Sun, 27 Mar 2011 01:26:55 +0800 Message-Id: <1301160415-24569-5-git-send-email-bosong.ly@taobao.com> X-Mailer: git-send-email 1.7.3.4 In-Reply-To: <1301160415-24569-1-git-send-email-bosong.ly@taobao.com> References: <1301160415-24569-1-git-send-email-bosong.ly@taobao.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This patch makes BUG_ON() usage correct in drivers/scsi/scsi_lib.c Cc: James Bottomley Cc: linux-scsi@vger.kernel.org Signed-off-by: Coly Li --- drivers/scsi/scsi_lib.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) Index: linux-2.6/drivers/scsi/scsi_lib.c =================================================================== --- linux-2.6.orig/drivers/scsi/scsi_lib.c +++ linux-2.6/drivers/scsi/scsi_lib.c @@ -1033,8 +1033,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;