mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Coly Li <bosong.ly@taobao.com>
To: linux-kernel@vger.kernel.org
Cc: Coly Li <bosong.ly@taobao.com>,
	James Bottomley <James.Bottomley@suse.de>,
	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	[thread overview]
Message-ID: <1301160415-24569-5-git-send-email-bosong.ly@taobao.com> (raw)
In-Reply-To: <1301160415-24569-1-git-send-email-bosong.ly@taobao.com>

This patch makes BUG_ON() usage correct in drivers/scsi/scsi_lib.c

Cc: James Bottomley <James.Bottomley@suse.de>
Cc: linux-scsi@vger.kernel.org
Signed-off-by: Coly Li <bosong.ly@taobao.com>
---
 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;

  parent reply	other threads:[~2011-03-26 17:08 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-03-26 17:26 [PATCH 0/4] " Coly Li
2011-03-26 17:26 ` [PATCH 1/4] dma: use BUG_ON correctly in iop-adma.c, v4 Coly Li
2011-03-26 17:26 ` [PATCH 2/4] dma: use BUG_ON correctly in mv_xor.c, v4 Coly Li
2011-03-26 17:26 ` [PATCH 3/4] dma: use BUG_ON correctly in ppc4xx/adam.c, v4 Coly Li
2011-03-26 17:26 ` Coly Li [this message]
2011-03-31  5:44 ` [PATCH 0/4] use BUG_ON correctly, v4 Koul, Vinod

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1301160415-24569-5-git-send-email-bosong.ly@taobao.com \
    --to=bosong.ly@taobao.com \
    --cc=James.Bottomley@suse.de \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-scsi@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®