Author: baggins Date: Fri Dec 30 10:29:35 2011 GMT Module: packages Tag: HEAD ---- Log message: - hunk present in 3.1.6
---- Files affected: packages/kernel: kernel-small_fixes.patch (1.50 -> 1.51) ---- Diffs: ================================================================ Index: packages/kernel/kernel-small_fixes.patch diff -u packages/kernel/kernel-small_fixes.patch:1.50 packages/kernel/kernel-small_fixes.patch:1.51 --- packages/kernel/kernel-small_fixes.patch:1.50 Fri Dec 2 20:49:05 2011 +++ packages/kernel/kernel-small_fixes.patch Fri Dec 30 11:29:29 2011 @@ -154,44 +154,6 @@ -commit 745718132c3c7cac98a622b610e239dcd5217f71 -Author: Hannes Reinecke <[email protected]> -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 <[email protected]> - Signed-off-by: James Bottomley <[email protected]> - -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; >From 4467601416e23740fc940c31b1fffacbcb69b4a0 Mon Sep 17 00:00:00 2001 From: Corey Minyard <[email protected]> Date: Mon, 21 Nov 2011 14:26:20 -0600 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel-small_fixes.patch?r1=1.50&r2=1.51&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
