diff options
Diffstat (limited to 'drivers/scsi/libsas/sas_scsi_host.c')
-rw-r--r-- | drivers/scsi/libsas/sas_scsi_host.c | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/drivers/scsi/libsas/sas_scsi_host.c b/drivers/scsi/libsas/sas_scsi_host.c index f0cfba9a1fc..535085cd27e 100644 --- a/drivers/scsi/libsas/sas_scsi_host.c +++ b/drivers/scsi/libsas/sas_scsi_host.c | |||
@@ -130,17 +130,6 @@ static void sas_scsi_task_done(struct sas_task *task) | |||
130 | sc->scsi_done(sc); | 130 | sc->scsi_done(sc); |
131 | } | 131 | } |
132 | 132 | ||
133 | static enum task_attribute sas_scsi_get_task_attr(struct scsi_cmnd *cmd) | ||
134 | { | ||
135 | enum task_attribute ta = TASK_ATTR_SIMPLE; | ||
136 | if (cmd->request && blk_rq_tagged(cmd->request)) { | ||
137 | if (cmd->device->ordered_tags && | ||
138 | (cmd->request->cmd_flags & REQ_HARDBARRIER)) | ||
139 | ta = TASK_ATTR_ORDERED; | ||
140 | } | ||
141 | return ta; | ||
142 | } | ||
143 | |||
144 | static struct sas_task *sas_create_task(struct scsi_cmnd *cmd, | 133 | static struct sas_task *sas_create_task(struct scsi_cmnd *cmd, |
145 | struct domain_device *dev, | 134 | struct domain_device *dev, |
146 | gfp_t gfp_flags) | 135 | gfp_t gfp_flags) |
@@ -160,7 +149,7 @@ static struct sas_task *sas_create_task(struct scsi_cmnd *cmd, | |||
160 | task->ssp_task.retry_count = 1; | 149 | task->ssp_task.retry_count = 1; |
161 | int_to_scsilun(cmd->device->lun, &lun); | 150 | int_to_scsilun(cmd->device->lun, &lun); |
162 | memcpy(task->ssp_task.LUN, &lun.scsi_lun, 8); | 151 | memcpy(task->ssp_task.LUN, &lun.scsi_lun, 8); |
163 | task->ssp_task.task_attr = sas_scsi_get_task_attr(cmd); | 152 | task->ssp_task.task_attr = TASK_ATTR_SIMPLE; |
164 | memcpy(task->ssp_task.cdb, cmd->cmnd, 16); | 153 | memcpy(task->ssp_task.cdb, cmd->cmnd, 16); |
165 | 154 | ||
166 | task->scatter = scsi_sglist(cmd); | 155 | task->scatter = scsi_sglist(cmd); |