diff --git a/[refs] b/[refs] index 4debf252434f..7130a88c20cb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 718eee0579b802aabe3bafacf09d0a9b0830f1dd +refs/heads/master: 5869619cb5b26754574375472fe54a390edf34c7 diff --git a/trunk/block/cfq-iosched.c b/trunk/block/cfq-iosched.c index 859f534ae9ef..aa00d8f2d0b0 100644 --- a/trunk/block/cfq-iosched.c +++ b/trunk/block/cfq-iosched.c @@ -393,8 +393,8 @@ cfq_prio_to_slice(struct cfq_data *cfqd, struct cfq_queue *cfqq) * to quickly follows sudden increases and decrease slowly */ -static inline unsigned -cfq_get_avg_queues(struct cfq_data *cfqd, bool rt) { +static inline unsigned cfq_get_avg_queues(struct cfq_data *cfqd, bool rt) +{ unsigned min_q, max_q; unsigned mult = cfq_hist_divisor - 1; unsigned round = cfq_hist_divisor / 2;