> -----Original Message----- > From: Andrew Morton [mailto:akpm@xxxxxxxxxxxxxxxxxxxx] > Sent: Tuesday, October 21, 2008 5:44 PM > To: Miller, Mike (OS Dev) > Cc: jens.axboe@xxxxxxxxxx; linux-kernel@xxxxxxxxxxxxxxx; > linux-scsi@xxxxxxxxxxxxxxx; fujita.tomonori@xxxxxxxxxxxxx; > adobriyan@xxxxxxxxx > Subject: Re: [PATCH 2/2] cciss:fix regression firmware not > displayed in procfs (again and again) > > On Tue, 21 Oct 2008 16:23:22 -0500 > Mike Miller <mike.miller@xxxxxx> wrote: > > > Patch 2 of 2 > > What happened with "1 of 2"? Andrew, That was the patch to fix the sysfs symlink. You merged it and then superceded with my later patch. --- snip ----- The patch titled cciss: fix sysfs regression has been removed from the -mm tree. Its filename was cciss-fix-sysfs-regression.patch This patch was dropped because an updated version will be merged The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: cciss: fix sysfs regression From: Mike Miller <mike.miller@xxxxxx> Fix a broken symlink in sysfs. Signed-off-by: Mike Miller <mike.miller@xxxxxx> Cc: Jens Axboe <jens.axboe@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/block/cciss.c | 1 + 1 file changed, 1 insertion(+) diff -puN drivers/block/cciss.c~cciss-fix-sysfs-regression drivers/block/cciss.c --- a/drivers/block/cciss.c~cciss-fix-sysfs-regression +++ a/drivers/block/cciss.c @@ -1365,6 +1365,7 @@ static void cciss_add_disk(ctlr_info_t * disk->first_minor = drv_index << NWD_SHIFT; disk->fops = &cciss_fops; disk->private_data = &h->drv[drv_index]; + disk->driverfs_dev = &h->pdev->dev; /* Set up queue information */ blk_queue_bounce_limit(disk->queue, h->pdev->dma_mask); _ Patches currently in -mm which might be from mike.miller@xxxxxx are origin.patch cciss-fix-sysfs-regression.patch ----snip----- Actually, this looks like the right one. -- mikem > > > Sorry for the delay. I've been out of the office and the > network has > > been down since before lunch CDT. This regression was introduced by > > commit 6ae5ce8e8d4de666f31286808d2285aa6a50fa40. > > This patch fixes a regression where the controller firmware > version is > > not displayed in procfs. The previous patch would be called anytime > > something changed. This will get called only once for each > controller. > > > > In this patch I again initialize *inq_buff to NULL per Tomo's > > comments. I also use a goto clean 4 instead of returning > -ENOMEM if the kzalloc fails. > > > > I hope this finally meets everyones expectations. > > > > Please consider this for inclusion. > > > > Signed-off-by: Mike Miller <mike.miller@xxxxxx> > > So this fix is needed in 2.6.27.x, yes? > -- To unsubscribe from this list: send the line "unsubscribe linux-scsi" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
