From: Mike Miller <mike.miller@hp.com>
Date: Thu, 6 Nov 2008 20:53:24 +0000 (-0800)
Subject: cciss: fix sysfs broken symlink regression
X-Git-Tag: v2.6.28-rc4~74
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=404443081ce5e6f68b5f7eda16c959835ff200c0;p=linux-2.6-omap-h63xx.git

cciss: fix sysfs broken symlink regression

Regression introduced by commit 6ae5ce8e8d4de666f31286808d2285aa6a50fa40
("cciss: remove redundant code").

This patch fixes a broken symlink in sysfs that was introduced by the
above commit.  We broke it in 2.6.27-rc on or about 20080804.  Some
installers are broken if this symlink does not exist and they may not
detect the logical drives configured on the controller.  It does not
require being backported into 2.6.26.x or earlier kernels.

Signed-off-by: Mike Miller <mike.miller@hp.com>
Cc: Jens Axboe <jens.axboe@oracle.com>
Cc: <stable@kernel.org>		[2.6.27.x]
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
---

diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c
index 00048bd26e7..dc38368435a 100644
--- a/drivers/block/cciss.c
+++ b/drivers/block/cciss.c
@@ -1370,6 +1370,7 @@ static void cciss_add_disk(ctlr_info_t *h, struct gendisk *disk,
 	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);