]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commitdiff
[SCSI] scsi_lib: use blk_rq_tagged in scsi_request_fn
authorMike Christie <michaelc@cs.wisc.edu>
Tue, 22 Jul 2008 20:34:38 +0000 (15:34 -0500)
committerJames Bottomley <James.Bottomley@HansenPartnership.com>
Sat, 26 Jul 2008 19:14:59 +0000 (15:14 -0400)
I goofed and did not see the macro for checking if a request is tagged.
This patch has us use blk_rq_tagged instead of digging into the req->tag.

Patch was made over scsi-misc.

Signed-off-by: Mike Christie <michaelc@cs.wisc.edu>
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
drivers/scsi/scsi_lib.c

index a20730c48020565ba49700f4c453512824fe4d8a..6d62be664d559ade857bc00abf0dda4c589cece7 100644 (file)
@@ -1533,7 +1533,7 @@ static void scsi_request_fn(struct request_queue *q)
                 * we add the dev to the starved list so it eventually gets
                 * a run when a tag is freed.
                 */
-               if (blk_queue_tagged(q) && (req->tag == -1)) {
+               if (blk_queue_tagged(q) && !blk_rq_tagged(req)) {
                        if (list_empty(&sdev->starved_entry))
                                list_add_tail(&sdev->starved_entry,
                                              &shost->starved_list);