Merge branch 'master' into csb1725

[mv-sheeva.git] / include / scsi / scsi_tcq.h

diff --git a/include/scsi/scsi_tcq.h b/include/scsi/scsi_tcq.h
index 17231385cb3721932bf02910854db0396d973b92..d6e7994aa634666f1ff072bf2fa96220d4b7e19f 100644 (file)
--- a/include/scsi/scsi_tcq.h
+++ b/include/scsi/scsi_tcq.h
@@ -97,13 +97,9 @@ static inline void scsi_deactivate_tcq(struct scsi_device *sdev, int depth)
 static inline int scsi_populate_tag_msg(struct scsi_cmnd *cmd, char *msg)
 {
         struct request *req = cmd->request;
-       struct scsi_device *sdev = cmd->device;
 
         if (blk_rq_tagged(req)) {
-               if (sdev->ordered_tags && req->cmd_flags & REQ_HARDBARRIER)
-                       *msg++ = MSG_ORDERED_TAG;
-               else
-                       *msg++ = MSG_SIMPLE_TAG;
+               *msg++ = MSG_SIMPLE_TAG;
                *msg++ = req->tag;
                return 2;
        }