Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-serial

[mirror_ubuntu-hirsute-kernel.git] / drivers / scsi / libsas / sas_scsi_host.c

diff --git a/drivers/scsi/libsas/sas_scsi_host.c b/drivers/scsi/libsas/sas_scsi_host.c
index 43e0e4e369346408a2512259960812755714db0a..e46e79355b776ec98a407962694a8e3756414571 100644 (file)
--- 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;
@@ -134,7 +134,7 @@ static enum task_attribute sas_scsi_get_task_attr(struct scsi_cmnd *cmd)
 
 static struct sas_task *sas_create_task(struct scsi_cmnd *cmd,
                                               struct domain_device *dev,
-                                              unsigned long gfp_flags)
+                                              gfp_t gfp_flags)
 {
        struct sas_task *task = sas_alloc_task(gfp_flags);
        struct scsi_lun lun;