summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeff Garzik2006-10-01 03:28:22 +0200
committerLinus Torvalds2006-10-01 04:33:43 +0200
commit1bdfd554be94def718323659173517c5d4a69d25 (patch)
tree706790ffc4edfe5e113edbff46f3618299423f80
parent[PATCH] scsi: device_reprobe() can fail (diff)
downloadkernel-qcow2-linux-1bdfd554be94def718323659173517c5d4a69d25.tar.gz
kernel-qcow2-linux-1bdfd554be94def718323659173517c5d4a69d25.tar.xz
kernel-qcow2-linux-1bdfd554be94def718323659173517c5d4a69d25.zip
[PATCH] SCSI: fix request flag-related build breakage
The ->flags in struct request was split into two variables, in a recent changeset. The merge of this change forgot to update SCSI's libsas, probably because libsas was a very recent merge. Signed-off-by: Jeff Garzik <jeff@garzik.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--drivers/scsi/libsas/sas_scsi_host.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/libsas/sas_scsi_host.c b/drivers/scsi/libsas/sas_scsi_host.c
index 7f9e89bcac7e..e46e79355b77 100644
--- a/drivers/scsi/libsas/sas_scsi_host.c
+++ b/drivers/scsi/libsas/sas_scsi_host.c
@@ -126,7 +126,7 @@ static enum task_attribute sas_scsi_get_task_attr(struct scsi_cmnd *cmd)
enum task_attribute ta = TASK_ATTR_SIMPLE;
if (cmd->request && blk_rq_tagged(cmd->request)) {
if (cmd->device->ordered_tags &&
- (cmd->request->flags & REQ_HARDBARRIER))
+ (cmd->request->cmd_flags & REQ_HARDBARRIER))
ta = TASK_ATTR_HOQ;
}
return ta;