- silence some messages (from master)

Changed files:
    kernel-small_fixes.patch -> 1.48

diff --git a/kernel-small_fixes.patch b/kernel-small_fixes.patch
index 8a3f5fa4278e617e4046c260540e2a878854a8b9..0ac083a669083d37babd7958fc68c7923a84f9ad 100644 (file)
--- a/kernel-small_fixes.patch
+++ b/kernel-small_fixes.patch
@@ -154,3 +154,41 @@ Please read the FAQ at  http://www.tux.org/lkml/
 
 
 
+commit 745718132c3c7cac98a622b610e239dcd5217f71
+Author: Hannes Reinecke <hare@suse.de>
+Date:   Wed Nov 9 08:39:24 2011 +0100
+
+    [SCSI] Silencing 'killing requests for dead queue'
+    
+    When we tear down a device we try to flush all outstanding
+    commands in scsi_free_queue(). However the check in
+    scsi_request_fn() is imperfect as it only signals that
+    we _might start_ aborting commands, not that we've actually
+    aborted some.
+    So move the printk inside the scsi_kill_request function,
+    this will also give us a hint about which commands are aborted.
+    
+    Signed-off-by: Hannes Reinecke <hare@suse.de>
+    Signed-off-by: James Bottomley <JBottomley@Parallels.com>
+
+diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
+index 06bc265..f85cfa6 100644
+--- a/drivers/scsi/scsi_lib.c
++++ b/drivers/scsi/scsi_lib.c
+@@ -1409,6 +1409,8 @@ static void scsi_kill_request(struct request *req, struct request_queue *q)
+ 
+       blk_start_request(req);
+ 
++      scmd_printk(KERN_INFO, cmd, "killing request\n");
++
+       sdev = cmd->device;
+       starget = scsi_target(sdev);
+       shost = sdev->host;
+@@ -1490,7 +1492,6 @@ static void scsi_request_fn(struct request_queue *q)
+       struct request *req;
+ 
+       if (!sdev) {
+-              printk("scsi: killing requests for dead queue\n");
+               while ((req = blk_peek_request(q)) != NULL)
+                       scsi_kill_request(req, q);
+               return;