From 5a5cc62f9eed4fe962a7fa8a4f4e21fbf5bfc1c2 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Arkadiusz=20Mi=C5=9Bkiewicz?= Date: Sun, 20 Nov 2011 21:54:07 +0000 Subject: [PATCH] - silence some messages (from master) Changed files: kernel-small_fixes.patch -> 1.48 --- kernel-small_fixes.patch | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/kernel-small_fixes.patch b/kernel-small_fixes.patch index 8a3f5fa4..0ac083a6 100644 --- 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 +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 + Signed-off-by: James Bottomley + +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; -- 2.44.0