Commit 74571813 authored Nov 09, 2011 by Hannes Reinecke Committed by James Bottomley Nov 09, 2011

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

parent 4e6c82b3

drivers/scsi/scsi_lib.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -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;

Admin message