[PATCH] Rearrange a few struct request members

This saves 8 bytes of data in 64-bit archs.

Signed-off-by: Jens Axboe <axboe@suse.de>

diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
index 371c0ce5f630e0188602d8071b5773893effea0a..aafe82788b4efcaebf6d7513d98a3fc038124c4c 100644 (file)
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
@@ -151,11 +151,9 @@ struct request {
        void *elevator_private;
        void *completion_data;
 
-       unsigned short ioprio;
-
        int rq_status;  /* should split this into a few status bits */
-       struct gendisk *rq_disk;
        int errors;
+       struct gendisk *rq_disk;
        unsigned long start_time;
 
        /* Number of scatter-gather DMA addr+len pairs after
@@ -170,8 +168,9 @@ struct request {
         */
        unsigned short nr_hw_segments;
 
+       unsigned short ioprio;
+
        int tag;
-       char *buffer;
 
        int ref_count;
        request_queue_t *q;
@@ -179,6 +178,7 @@ struct request {
 
        struct completion *waiting;
        void *special;
+       char *buffer;
 
        /*
         * when request is used as a packet command carrier
@@ -187,9 +187,8 @@ struct request {
        unsigned char cmd[BLK_MAX_CDB];
 
        unsigned int data_len;
-       void *data;
-
        unsigned int sense_len;
+       void *data;
        void *sense;
 
        unsigned int timeout;