aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/blkdev.h
diff options
context:
space:
mode:
authorJens Axboe <axboe@kernel.dk>2013-05-23 06:25:08 -0400
committerJens Axboe <axboe@kernel.dk>2013-10-25 06:55:59 -0400
commit5953316dbf90067ebdeca626c34488bc166b73a8 (patch)
tree730871975e089bf4a53e8625ac8a5198fd678c8d /include/linux/blkdev.h
parentc84a83e2aaab02a5ca64a982aa55342784934479 (diff)
block: make rq->cmd_flags be 64-bit
We have officially run out of flags in a 32-bit space. Extend it to 64-bit even on 32-bit archs. Reviewed-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'include/linux/blkdev.h')
-rw-r--r--include/linux/blkdev.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
index 0e6f765aa1f5..f5c7596c93dd 100644
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
@@ -99,7 +99,7 @@ struct request {
99 99
100 struct request_queue *q; 100 struct request_queue *q;
101 101
102 unsigned int cmd_flags; 102 u64 cmd_flags;
103 enum rq_cmd_type_bits cmd_type; 103 enum rq_cmd_type_bits cmd_type;
104 unsigned long atomic_flags; 104 unsigned long atomic_flags;
105 105
@@ -570,7 +570,7 @@ static inline void queue_flag_clear(unsigned int flag, struct request_queue *q)
570 570
571#define list_entry_rq(ptr) list_entry((ptr), struct request, queuelist) 571#define list_entry_rq(ptr) list_entry((ptr), struct request, queuelist)
572 572
573#define rq_data_dir(rq) ((rq)->cmd_flags & 1) 573#define rq_data_dir(rq) (((rq)->cmd_flags & 1) != 0)
574 574
575static inline unsigned int blk_queue_cluster(struct request_queue *q) 575static inline unsigned int blk_queue_cluster(struct request_queue *q)
576{ 576{