diff options
| author |   Hannes Reinecke <hare@suse.de> | 2011-11-09 08:39:24 +0100 |
|---|---|---|
| committer |   James Bottomley <JBottomley@Parallels.com> | 2011-11-09 12:07:07 -0600 |
| commit | 745718132c3c7cac98a622b610e239dcd5217f71 (patch) | |
| tree | 5f42d67a438d56a3740729c959ef203d9302ebbc /drivers/scsi | |
| parent | [SCSI] fix WARNING: at drivers/scsi/scsi_lib.c:1704 (diff) | |
| download | linux-dev-745718132c3c7cac98a622b610e239dcd5217f71.tar.xz linux-dev-745718132c3c7cac98a622b610e239dcd5217f71.zip | |
[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>
Diffstat (limited to 'drivers/scsi')
| -rw-r--r-- | drivers/scsi/scsi_lib.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c index 06bc26554a67..f85cfa6c47b5 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; |