Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 745718132c3c7cac98a622b610e239dcd5217f71

Authored by Hannes Reinecke
Committed by James Bottomley
1 parent 4e6c82b361
Exists in master and in 6 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

[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>

Showing 1 changed file with 2 additions and 1 deletions Side-by-side Diff

drivers/scsi/scsi_lib.c
Diff comments   View file @ 7457181
... ... @@ -1409,6 +1409,8 @@
1409 1409  
1410 1410 blk_start_request(req);
1411 1411  
  1412 + scmd_printk(KERN_INFO, cmd, "killing request\n");
  1413 +
1412 1414 sdev = cmd->device;
1413 1415 starget = scsi_target(sdev);
1414 1416 shost = sdev->host;
... ... @@ -1490,7 +1492,6 @@
1490 1492 struct request *req;
1491 1493  
1492 1494 if (!sdev) {
1493   - printk("scsi: killing requests for dead queue\n");
1494 1495 while ((req = blk_peek_request(q)) != NULL)
1495 1496 scsi_kill_request(req, q);
1496 1497 return;