public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Michal Marek <mmarek@suse.cz>
To: Jens Axboe <axboe@kernel.dk>
Cc: "Stephen M. Cameron" <scameron@beardog.cce.hp.com>,
	akpm@linux-foundation.org, smcameron@yahoo.com,
	linux-kernel@vger.kernel.org, mike.miller@hp.com,
	thenzl@redhat.com, Linus Torvalds <torvalds@linux-foundation.org>
Subject: Re: [PATCH] cciss: fix cciss_revalidate panic.
Date: Tue, 21 Dec 2010 00:42:13 +0100	[thread overview]
Message-ID: <20101220234213.GA10060@sepie.suse.cz> (raw)
In-Reply-To: <4D0B190E.1030206@kernel.dk>

On Fri, Dec 17, 2010 at 09:02:22AM +0100, Jens Axboe wrote:
> On 2010-12-16 20:02, Stephen M. Cameron wrote:
> > From: Stephen M. Cameron <StephenM.Cameron>
> > 
> > If you delete a logical drive, and then run BLKRRPART (e.g. via fdisk)
> > on a logical drive which is "after" the deleted logical drive in the h->drv[]
> > array, then cciss_revalidate panics because it will access the null pointer
> > h->drv[x] when x hits the deleted drive.
> 
> Thanks Stephen. I put this in for-linus for 2.6.37 and marked it for
> stable backport.

This got applied without the semicolon after 'continue' somehow and
broke build. Please apply the patch below.

Michal

>From 70b720652024b23d71d72a1464f174df124600b7 Mon Sep 17 00:00:00 2001
From: Michal Marek <mmarek@suse.cz>
Date: Tue, 21 Dec 2010 00:35:56 +0100
Subject: [PATCH] cciss: Fix build

drivers/block/cciss.c:2839:3: error: expected ';' before 'if'

Signed-off-by: Michal Marek <mmarek@suse.cz>

diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c
index 233e06c..8e0f925 100644
--- a/drivers/block/cciss.c
+++ b/drivers/block/cciss.c
@@ -2835,7 +2835,7 @@ static int cciss_revalidate(struct gendisk *disk)
 
 	for (logvol = 0; logvol < CISS_MAX_LUN; logvol++) {
 		if (!h->drv[logvol])
-			continue
+			continue;
 		if (memcmp(h->drv[logvol]->LunID, drv->LunID,
 			sizeof(drv->LunID)) == 0) {
 			FOUND = 1;

  reply	other threads:[~2010-12-20 23:42 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-12-16 19:02 [PATCH] cciss: fix cciss_revalidate panic Stephen M. Cameron
2010-12-17  8:02 ` Jens Axboe
2010-12-20 23:42   ` Michal Marek [this message]
2010-12-21  7:33     ` Jens Axboe
2010-12-21  7:38       ` Jens Axboe

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=20101220234213.GA10060@sepie.suse.cz \
    --to=mmarek@suse.cz \
    --cc=akpm@linux-foundation.org \
    --cc=axboe@kernel.dk \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mike.miller@hp.com \
    --cc=scameron@beardog.cce.hp.com \
    --cc=smcameron@yahoo.com \
    --cc=thenzl@redhat.com \
    --cc=torvalds@linux-foundation.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