* Re: [PATCH] cciss: bug fix in cciss_remove_one
[not found] <200509131910.j8DJAOfZ024676@hera.kernel.org>
@ 2005-09-13 19:27 ` Jeff Garzik
0 siblings, 0 replies; only message in thread
From: Jeff Garzik @ 2005-09-13 19:27 UTC (permalink / raw)
To: mike.miller; +Cc: Linux Kernel Mailing List, Andrew Morton, Jens Axboe
Linux Kernel Mailing List wrote:
> tree 30a07d018d74fbd99d323d6d6a6e08cac3a1b767
> parent 33079b21978f478865068ee6a3c5807b6c6ecdbe
> author Mike Miller <mike.miller@hp.com> Tue, 13 Sep 2005 15:25:23 -0700
> committer Linus Torvalds <torvalds@g5.osdl.org> Tue, 13 Sep 2005 22:22:30 -0700
>
> [PATCH] cciss: bug fix in cciss_remove_one
>
> This patch fixes a bug in cciss_remove_one. A set of braces was missing for
> the if statement causing an Oops on driver unload.
>
> Signed-off-by: Mike Miller <mike.miller@hp.com>
> Signed-off-by: Andrew Morton <akpm@osdl.org>
> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
>
> drivers/block/cciss.c | 5 +++--
> 1 files changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c
> --- a/drivers/block/cciss.c
> +++ b/drivers/block/cciss.c
> @@ -3095,9 +3095,10 @@ static void __devexit cciss_remove_one (
> /* remove it from the disk list */
> for (j = 0; j < NWD; j++) {
> struct gendisk *disk = hba[i]->gendisk[j];
> - if (disk->flags & GENHD_FL_UP)
> - blk_cleanup_queue(disk->queue);
> + if (disk->flags & GENHD_FL_UP) {
> del_gendisk(disk);
> + blk_cleanup_queue(disk->queue);
hrm. Would be nice to get cciss patches reviewed by Jens or me, or
somebody...
Take a look at drivers/block/sx8.c:carm_free_disks() for the proper way
to do this.
Jeff
^ permalink raw reply [flat|nested] only message in thread