2 files changed, 6 insertions, 4 deletions

diff --git a/include/scsi/scsi_cmnd.h b/include/scsi/scsi_cmnd.h
index 522a5f27f553..e119142e565e 100644
--- a/include/scsi/scsi_cmnd.h
+++ b/include/scsi/scsi_cmnd.h
@@ -53,6 +53,9 @@ struct scsi_pointer {
         volatile int phase;
 };
 
+/* for scmd->flags */
+#define SCMD_TAGGED             (1 << 0)
+
 struct scsi_cmnd {
         struct scsi_device *device;
         struct list_head list;  /* scsi_cmnd participates in queue lists */
@@ -132,6 +135,7 @@ struct scsi_cmnd {
                                          * to be at an address < 16Mb). */
 
         int result;             /* Status code from lower level driver */
+        int flags;              /* Command flags */
 
         unsigned char tag;      /* SCSI-II queued command tag */
 };
diff --git a/include/scsi/scsi_tcq.h b/include/scsi/scsi_tcq.h
index 1712dab6e00e..032df74b66d7 100644
--- a/include/scsi/scsi_tcq.h
+++ b/include/scsi/scsi_tcq.h
@@ -101,11 +101,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;
-
-        if (blk_rq_tagged(req)) {
+        if (cmd->flags & SCMD_TAGGED) {
                 *msg++ = MSG_SIMPLE_TAG;
-                *msg++ = req->tag;
+                *msg++ = cmd->request->tag;
                 return 2;
         }