packages: kernel/kernel-small_fixes.patch - silence some messages (from mas...

[arekm]

Author: arekm                        Date: Sun Nov 20 21:54:12 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- silence some messages (from master)

---- Files affected:
packages/kernel:
   kernel-small_fixes.patch (1.47 -> 1.48) 

---- Diffs:

================================================================
Index: packages/kernel/kernel-small_fixes.patch
diff -u packages/kernel/kernel-small_fixes.patch:1.47 packages/kernel/kernel-small_fixes.patch:1.48
--- packages/kernel/kernel-small_fixes.patch:1.47	Sat Nov 19 09:46:17 2011
+++ packages/kernel/kernel-small_fixes.patch	Sun Nov 20 22:54:07 2011
@@ -154,3 +154,41 @@
 
 
 
+commit 745718132c3c7cac98a622b610e239dcd5217f71
+Author: Hannes Reinecke <hare at 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 at suse.de>
+    Signed-off-by: James Bottomley <JBottomley at 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;
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel-small_fixes.patch?r1=1.47&r2=1.48&f=u