| From e999dbc254044e8d2a5818d92d205f65bae28f37 Mon Sep 17 00:00:00 2001 |
| From: Christoph Hellwig <hch@lst.de> |
| Date: Sun, 19 Oct 2014 17:13:57 +0200 |
| Subject: Revert "block: all blk-mq requests are tagged" |
| |
| From: Christoph Hellwig <hch@lst.de> |
| |
| 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: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| include/linux/blkdev.h | 3 +-- |
| 1 file changed, 1 insertion(+), 2 deletions(-) |
| |
| --- a/include/linux/blkdev.h |
| +++ b/include/linux/blkdev.h |
| @@ -1142,8 +1142,7 @@ static inline bool blk_needs_flush_plug( |
| /* |
| * 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 *); |
