Commit 0b7576d8 authored by Jens Axboe's avatar Jens Axboe

block: move ->timeout request member

After the recent timeout handling changes, we have two holes in
the struct. Move the timeout near the deadline, killing both,
and moving related members closer together. On my config on
x86-64, this shrinks struct request from 312 to 304 bytes.
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent d1210d5a
...@@ -237,8 +237,6 @@ struct request { ...@@ -237,8 +237,6 @@ struct request {
unsigned short write_hint; unsigned short write_hint;
unsigned short ioprio; unsigned short ioprio;
unsigned int timeout;
void *special; /* opaque pointer available for LLD use */ void *special; /* opaque pointer available for LLD use */
unsigned int extra_len; /* length of alignment and padding */ unsigned int extra_len; /* length of alignment and padding */
...@@ -246,6 +244,8 @@ struct request { ...@@ -246,6 +244,8 @@ struct request {
enum mq_rq_state state; enum mq_rq_state state;
refcount_t ref; refcount_t ref;
unsigned int timeout;
/* access through blk_rq_set_deadline, blk_rq_deadline */ /* access through blk_rq_set_deadline, blk_rq_deadline */
unsigned long __deadline; unsigned long __deadline;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment