diff options
author | Christoph Hellwig <hch@lst.de> | 2016-06-09 10:00:35 -0400 |
---|---|---|
committer | Jens Axboe <axboe@fb.com> | 2016-06-09 11:52:09 -0400 |
commit | ca93e45347e61cd85e5d71961f6c94fad143593d (patch) | |
tree | 3442c134a3df80889ab50b7ff6e782e29c557ff3 | |
parent | 60a40096a3b289c28429221c12a5a6890350d919 (diff) |
block: better packing for struct request
Keep the 32-bit CPU and cmd_type flags together to avoid holes on 64-bit
architectures.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens Axboe <axboe@fb.com>
-rw-r--r-- | include/linux/blkdev.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h index 0c9f8793c87e..9746d223494c 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h | |||
@@ -96,12 +96,11 @@ struct request { | |||
96 | struct request_queue *q; | 96 | struct request_queue *q; |
97 | struct blk_mq_ctx *mq_ctx; | 97 | struct blk_mq_ctx *mq_ctx; |
98 | 98 | ||
99 | u64 cmd_flags; | 99 | int cpu; |
100 | unsigned cmd_type; | 100 | unsigned cmd_type; |
101 | u64 cmd_flags; | ||
101 | unsigned long atomic_flags; | 102 | unsigned long atomic_flags; |
102 | 103 | ||
103 | int cpu; | ||
104 | |||
105 | /* the following two fields are internal, NEVER access directly */ | 104 | /* the following two fields are internal, NEVER access directly */ |
106 | unsigned int __data_len; /* total data len */ | 105 | unsigned int __data_len; /* total data len */ |
107 | sector_t __sector; /* sector cursor */ | 106 | sector_t __sector; /* sector cursor */ |