r1554 - in trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian: . patches patches/series

[Christoph Hellwig]

Author: hch-guest
Date: 2004-09-05 05:24:49 -0600 (Sun, 05 Sep 2004)
New Revision: 1554

Added:
   trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/scsi-shutdown-fix.dpatch
Modified:
   trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/changelog
   trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/series/2.6.8-6
Log:

  * Make sure SCSI disk caches are flushed on shutdown (Christoph Hellwig).



Modified: trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/changelog
===================================================================
--- trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/changelog	2004-09-05 03:51:45 UTC (rev 1553)
+++ trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/changelog	2004-09-05 11:24:49 UTC (rev 1554)
@@ -24,6 +24,8 @@
 
   * Add CAPI skb freeing fix (closes: #269134) (Christoph Hellwig).
 
+  * Make sure SCSI disk caches are flushed on shutdown (Christoph Hellwig).
+
  -- Sven Luther <luther@debian.org>  Tue, 31 Aug 2004 11:29:36 +0200
 
 kernel-source-2.6.8 (2.6.8-5) unstable; urgency=high

Added: trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/scsi-shutdown-fix.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/scsi-shutdown-fix.dpatch	2004-09-05 03:51:45 UTC (rev 1553)
+++ trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/scsi-shutdown-fix.dpatch	2004-09-05 11:24:49 UTC (rev 1554)
@@ -0,0 +1,66 @@
+# This is a BitKeeper generated diff -Nru style patch.
+#
+# ChangeSet
+#   2004/08/16 22:53:00-04:00 andmike@us.ibm.com 
+#   [PATCH] reorder call in scsi_remove_host
+#   
+#   This patch against scsi-misc-2.6 reorders a call to scsi_forget_host in
+#   the scsi_remove_host function. This removes the error message
+#   "Synchronizing SCSI cache..." on rmmod of a scsi host driver module as
+#   shown in example output 1 and 2 below.
+#   
+#   I had previous created a much more complicated patch to work around this
+#   problem. In response Christoph mention a simpler solution (pointer to
+#   thread below) which is this patch.
+#   
+#   http://marc.theaimsgroup.com/?l=linux-scsi&m=108720042210331&w=2
+#   
+#   Example output.
+#   
+#   1.) Before patch.
+#   
+#   elm:~# scsi1 : scsi_debug, version 1.73 [20040518], dev_size_mb=8,
+#   opts=0x0
+#     Vendor: Linux     Model: scsi_debug        Rev: 0004
+#     Type:   Direct-Access                      ANSI SCSI revision: 03
+#   SCSI device sdc: 16384 512-byte hdwr sectors (8 MB)
+#   SCSI device sdc: drive cache: write back
+#    sdc: unknown partition table
+#   Attached scsi disk sdc at scsi1, channel 0, id 0, lun 0
+#   Attached scsi generic sg4 at scsi1, channel 0, id 0, lun 0,  type 0
+#   Synchronizing SCSI cache for disk sdc: <4>FAILED
+#     status = 0, message = 00, host = 1, driver = 00
+#   
+#   2.) After patch.
+#   
+#   elm:~# scsi1 : scsi_debug, version 1.73 [20040518], dev_size_mb=8, opts=0x0
+#     Vendor: Linux     Model: scsi_debug        Rev: 0004
+#     Type:   Direct-Access                      ANSI SCSI revision: 03
+#   SCSI device sdc: 16384 512-byte hdwr sectors (8 MB)
+#   SCSI device sdc: drive cache: write back
+#    sdc: unknown partition table
+#   Attached scsi disk sdc at scsi1, channel 0, id 0, lun 0
+#   Attached scsi generic sg4 at scsi1, channel 0, id 0, lun 0,  type 0
+#   Synchronizing SCSI cache for disk sdc:
+#   
+#   Signed-off-by: Mike Anderson <andmike@us.ibm.com>
+#   Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
+# 
+# drivers/scsi/hosts.c
+#   2004/08/11 13:35:07-04:00 andmike@us.ibm.com +1 -1
+#   reorder call in scsi_remove_host
+# 
+diff -Nru a/drivers/scsi/hosts.c b/drivers/scsi/hosts.c
+--- a/drivers/scsi/hosts.c	2004-09-05 13:22:05 +02:00
++++ b/drivers/scsi/hosts.c	2004-09-05 13:22:05 +02:00
+@@ -75,9 +75,9 @@
+  **/
+ void scsi_remove_host(struct Scsi_Host *shost)
+ {
++	scsi_forget_host(shost);
+ 	scsi_host_cancel(shost, 0);
+ 	scsi_proc_host_rm(shost);
+-	scsi_forget_host(shost);
+ 
+ 	set_bit(SHOST_DEL, &shost->shost_state);
+ 

Modified: trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/series/2.6.8-6
===================================================================
--- trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/series/2.6.8-6	2004-09-05 03:51:45 UTC (rev 1553)
+++ trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/series/2.6.8-6	2004-09-05 11:24:49 UTC (rev 1554)
@@ -10,3 +10,4 @@
 + hfs-loop-fix.dpatch
 + powerpc-cmdline.dpatch
 + capi-freeing-fix.dpatch
++ scsi-shutdown-fix.dpatch