block: move timeout field in struct request to pack better

After commit 64c7f1d1572c, we went from 1 to 2 holes in my
test setup. If we move the timeout field a bit, we remove
both of those holes and shrink struct request by 8 bytes.

Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens Axboe <axboe@fb.com>

diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
index ce6f9a6534c937062648e6fd7db90510e2a26f0a..3cf241b0814d007cec1dbbf27931ff33e1849bbe 100644 (file)
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
@@ -215,6 +215,8 @@ struct request {
 
        unsigned short ioprio;
 
+       unsigned int timeout;
+
        void *special;          /* opaque pointer available for LLD use */
 
        int errors;
@@ -223,7 +225,6 @@ struct request {
 
        unsigned long deadline;
        struct list_head timeout_list;
-       unsigned int timeout;
 
        /*
         * completion callback.