diff options
| author | Christoph Hellwig <hch@lst.de> | 2014-10-19 17:13:57 +0200 |
|---|---|---|
| committer | Luis Henriques <luis.henriques@canonical.com> | 2014-11-13 11:48:49 +0000 |
| commit | 2b8ffed36eff00fb2b942096046366d87ce8b549 (patch) | |
| tree | 11ec467f2f0cdd264a716cf71902afa3a88c5f9c /include/linux | |
| parent | 3bd0a2c1c916a4f174f354c514a31d3510bea75d (diff) | |
Revert "block: all blk-mq requests are tagged"
commit e999dbc254044e8d2a5818d92d205f65bae28f37 upstream.
This reverts commit fb3ccb5da71273e7f0d50b50bc879e50cedd60e7.
SCSI-2/SPI actually needs the tagged/untagged flag in the request to
work properly. Revert this patch and add a follow on to set it in
the right place.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Martin K. Petersen <martin.petersen@oracle.com>
Acked-by: Jens Axboe <axboe@kernel.dk>
Reported-by: Meelis Roos <mroos@linux.ee>
Tested-by: Meelis Roos <mroos@linux.ee>
Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/blkdev.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h index 8699bcf5f099..279390ee523a 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h @@ -1140,8 +1140,7 @@ static inline bool blk_needs_flush_plug(struct task_struct *tsk) /* * tag stuff */ -#define blk_rq_tagged(rq) \ - ((rq)->mq_ctx || ((rq)->cmd_flags & REQ_QUEUED)) +#define blk_rq_tagged(rq) ((rq)->cmd_flags & REQ_QUEUED) extern int blk_queue_start_tag(struct request_queue *, struct request *); extern struct request *blk_queue_find_tag(struct request_queue *, int); extern void blk_queue_end_tag(struct request_queue *, struct request *); |