Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 275526
b: refs/heads/master
c: 7457181
h: refs/heads/master
v: v3
  • Loading branch information
Hannes Reinecke authored and James Bottomley committed Nov 9, 2011
1 parent 3a567bf commit b7c1219
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 4e6c82b3614a18740ef63109d58743a359266daf
refs/heads/master: 745718132c3c7cac98a622b610e239dcd5217f71
3 changes: 2 additions & 1 deletion trunk/drivers/scsi/scsi_lib.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit b7c1219

Please sign in to comment.