From fa85f9814ba508c0b9cadcf3ddb6c9edf5e37074 Mon Sep 17 00:00:00 2001 From: Richard Kennedy Date: Mon, 22 Feb 2010 13:49:24 +0100 Subject: [PATCH] --- yaml --- r: 182919 b: refs/heads/master c: c4081ba5c9f6f7bdffe49e501a8604a2c0797ef9 h: refs/heads/master i: 182917: 0ddcb99ea8b76e6e8e9c6c8d17fba1e34d538295 182915: 39cc1ea3adb19a587f5c485a3b44126de03e9ffe 182911: 44835a91141d7129bbf77c196d3ef320a9515988 v: v3 --- [refs] | 2 +- trunk/block/cfq-iosched.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 1bfffa72996f..a85fb22d6f0b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f11cbd74c5ff3614f6390b4de67a6ffdc614c378 +refs/heads/master: c4081ba5c9f6f7bdffe49e501a8604a2c0797ef9 diff --git a/trunk/block/cfq-iosched.c b/trunk/block/cfq-iosched.c index 023f4e69a337..e3dedfd3bcb4 100644 --- a/trunk/block/cfq-iosched.c +++ b/trunk/block/cfq-iosched.c @@ -115,11 +115,11 @@ struct cfq_queue { /* time when queue got scheduled in to dispatch first request. */ unsigned long dispatch_start; unsigned int allocated_slice; + unsigned int slice_dispatch; /* time when first request from queue completed and slice started. */ unsigned long slice_start; unsigned long slice_end; long slice_resid; - unsigned int slice_dispatch; /* pending metadata requests */ int meta_pending; @@ -130,13 +130,13 @@ struct cfq_queue { unsigned short ioprio, org_ioprio; unsigned short ioprio_class, org_ioprio_class; + pid_t pid; + unsigned int seek_samples; u64 seek_total; sector_t seek_mean; sector_t last_request_pos; - pid_t pid; - struct cfq_rb_root *service_tree; struct cfq_queue *new_cfqq; struct cfq_group *cfqg;