rpms/kernel/devel linux-2.6-blk-cciss-fix-regression-sysfs-symlink-missing.patch, NONE, 1.1 kernel.spec, 1.1050, 1.1051

[Chuck Ebbert]

Author: cebbert

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

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-blk-cciss-fix-regression-sysfs-symlink-missing.patch 
Log Message:
Fix cciss sysfs links. (#466181)

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

--- NEW FILE linux-2.6-blk-cciss-fix-regression-sysfs-symlink-missing.patch ---
This patch fixes a regression where the device symlink to the pci address is
not created. Offending commit 6ae5ce8e8d4de666f31286808d2285aa6a50fa40,
cciss: rmove redundant code.

Please consider this for inclusion.

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
--- 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);
 
 	/* Set up queue information */
 	blk_queue_bounce_limit(disk->queue, h->pdev->dma_mask);



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1050
retrieving revision 1.1051
diff -u -r1.1050 -r1.1051
--- kernel.spec	15 Oct 2008 18:03:09 -0000	1.1050
+++ kernel.spec	15 Oct 2008 21:31:21 -0000	1.1051
@@ -692,6 +692,9 @@
 Patch2902: linux-2.6.27-xfs-barrier-fix.patch
 Patch2903: linux-2.6.27-xfs-remount-fix.patch
 
+# cciss sysfs links are broken
+Patch3000: linux-2.6-blk-cciss-fix-regression-sysfs-symlink-missing.patch
+
 %endif
 
 BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -1202,6 +1205,9 @@
 # but the drive isn't yet ready.
 ApplyPatch linux-2.6-cdrom-door-status.patch
 
+# fix sysfs links for the cciss driver
+ApplyPatch linux-2.6-blk-cciss-fix-regression-sysfs-symlink-missing.patch
+
 ApplyPatch linux-2.6-e1000-ich9.patch
 
 ApplyPatch linux-2.6-e1000e-add-support-for-the-82567LM-4-device.patch
@@ -1816,7 +1822,10 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
-* Wed Oct 15 2008 Roland McGrath <roland at redhat.com>
+* Wed Oct 15 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.27-15
+- Fix cciss sysfs links. (#466181)
+
+* Wed Oct 15 2008 Roland McGrath <roland at redhat.com> 2.6.27-14
 - fix x86 syscall_get_arguments() order
 
 * Wed Oct 15 2008 Dave Airlie <airlied at redhat.com>