rpms/kernel/devel kernel.spec, 1.1057, 1.1058 linux-2.6-blk-cciss-fix-regression-sysfs-symlink-missing.patch, 1.1, 1.2

[Chuck Ebbert]

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4396

Modified Files:
	kernel.spec 
	linux-2.6-blk-cciss-fix-regression-sysfs-symlink-missing.patch 
Log Message:
Fix the cciss sysfs links fix.


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1057
retrieving revision 1.1058
diff -u -r1.1057 -r1.1058
--- kernel.spec	16 Oct 2008 18:17:31 -0000	1.1057
+++ kernel.spec	16 Oct 2008 23:20:37 -0000	1.1058
@@ -1833,6 +1833,9 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Thu Oct 16 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.27.1-22
+- Fix the cciss sysfs links fix.
+
 * Thu Oct 16 2008 Adam Jackson <ajax at redhat.com> 2.6.27.1-21
 - Don't carp about PCI BAR allocation failures in quiet boot
 

linux-2.6-blk-cciss-fix-regression-sysfs-symlink-missing.patch:

Index: linux-2.6-blk-cciss-fix-regression-sysfs-symlink-missing.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-blk-cciss-fix-regression-sysfs-symlink-missing.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-blk-cciss-fix-regression-sysfs-symlink-missing.patch	15 Oct 2008 21:31:21 -0000	1.1
+++ linux-2.6-blk-cciss-fix-regression-sysfs-symlink-missing.patch	16 Oct 2008 23:20:37 -0000	1.2
@@ -1,21 +1,23 @@
 This patch fixes a regression where the device symlink to the pci address is
 not created. Offending commit 6ae5ce8e8d4de666f31286808d2285aa6a50fa40,
-cciss: rmove redundant code.
+cciss: remove redundant code.
 
+This patch obsoletes the one I sent yesterday. It fixes a broken symlink in
+sysfs. The previous patch appeared to work but was wrong as reported by Alan
+Brunelle.
 Please consider this for inclusion.
 
-signed-off-by: Mike Miller <mike.miller at hp.com>
+Signed-off-by: Mike Miller <mike.miller at hp.com>
 
 diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c
-index 1e1f915..44fb98e 100644
+index 1e1f915..0f367b1 100644
 --- a/drivers/block/cciss.c
 +++ b/drivers/block/cciss.c
 @@ -1365,6 +1365,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 = &(hba[drv_index]->pdev->dev);
++	disk->driverfs_dev = &h->pdev->dev;
  
  	/* Set up queue information */
  	blk_queue_bounce_limit(disk->queue, h->pdev->dma_mask);
-