diff options
| author | Richard Kennedy <richard@rsk.demon.co.uk> | 2010-03-01 10:50:20 +0100 |
|---|---|---|
| committer | Jens Axboe <jens.axboe@oracle.com> | 2010-03-01 10:50:20 +0100 |
| commit | 73e9ffdd0cc8159f876d5e29ecf2d9c1bfca544f (patch) | |
| tree | 3c7382e98d82234ab4b6eddebcc939071c963c5e /block/cfq-iosched.c | |
| parent | block: fix for "Consolidate phys_segment and hw_segment limits" (diff) | |
| download | linux-73e9ffdd0cc8159f876d5e29ecf2d9c1bfca544f.tar.xz linux-73e9ffdd0cc8159f876d5e29ecf2d9c1bfca544f.zip | |
cfq: remove 8 bytes of padding from cfq_rb_root on 64 bit builds
Reorder cfq_rb_root to remove 8 bytes of padding on 64 bit builds.
Consequently removing 56 bytes from cfq_group and 64 bytes from
cfq_data.
Signed-off-by: Richard Kennedy <richard@rsk.demon.co.uk>
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
Diffstat (limited to 'block/cfq-iosched.c')
| -rw-r--r-- | block/cfq-iosched.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/block/cfq-iosched.c b/block/cfq-iosched.c index 0db07d7771b5..dee9d9378fee 100644 --- a/block/cfq-iosched.c +++ b/block/cfq-iosched.c @@ -78,11 +78,12 @@ struct cfq_rb_root { struct rb_root rb; struct rb_node *left; unsigned count; + unsigned total_weight; u64 min_vdisktime; struct rb_node *active; - unsigned total_weight; }; -#define CFQ_RB_ROOT (struct cfq_rb_root) { RB_ROOT, NULL, 0, 0, } +#define CFQ_RB_ROOT (struct cfq_rb_root) { .rb = RB_ROOT, .left = NULL, \ + .count = 0, .min_vdisktime = 0, } /* * Per process-grouping structure |