* [PATCH] cfq-iosched: Fix update_vdisktime logic
@ 2011-01-25 3:27 Gui Jianfeng
2011-01-25 21:26 ` Vivek Goyal
0 siblings, 1 reply; 4+ messages in thread
From: Gui Jianfeng @ 2011-01-25 3:27 UTC (permalink / raw)
To: Vivek Goyal, Jens Axboe; +Cc: lkml
The update_vdisktime logic is broken since commit b54ce60eb7f61f8e314b8b241b0469eda3bb1d42,
st->min_vdisktime never makes a progress. Fix it.
Thanks Vivek for pointing it out.
Signed-off-by: Gui Jianfeng <guijianfen@cn.fujitsu.com>
---
block/cfq-iosched.c | 6 ++----
1 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/block/cfq-iosched.c b/block/cfq-iosched.c
index f083bda..8c28f56 100644
--- a/block/cfq-iosched.c
+++ b/block/cfq-iosched.c
@@ -558,15 +558,13 @@ static inline u64 min_vdisktime(u64 min_vdisktime, u64 vdisktime)
static void update_min_vdisktime(struct cfq_rb_root *st)
{
- u64 vdisktime = st->min_vdisktime;
struct cfq_group *cfqg;
if (st->left) {
cfqg = rb_entry_cfqg(st->left);
- vdisktime = min_vdisktime(vdisktime, cfqg->vdisktime);
+ st->min_vdisktime = max_vdisktime(st->min_vdisktime,
+ cfqg->vdisktime);
}
-
- st->min_vdisktime = max_vdisktime(st->min_vdisktime, vdisktime);
}
/*
--
1.7.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] cfq-iosched: Fix update_vdisktime logic
2011-01-25 3:27 [PATCH] cfq-iosched: Fix update_vdisktime logic Gui Jianfeng
@ 2011-01-25 21:26 ` Vivek Goyal
2011-03-07 1:35 ` Gui Jianfeng
0 siblings, 1 reply; 4+ messages in thread
From: Vivek Goyal @ 2011-01-25 21:26 UTC (permalink / raw)
To: Gui Jianfeng; +Cc: Jens Axboe, lkml
On Tue, Jan 25, 2011 at 11:27:19AM +0800, Gui Jianfeng wrote:
> The update_vdisktime logic is broken since commit b54ce60eb7f61f8e314b8b241b0469eda3bb1d42,
> st->min_vdisktime never makes a progress. Fix it.
>
> Thanks Vivek for pointing it out.
>
> Signed-off-by: Gui Jianfeng <guijianfen@cn.fujitsu.com>
Thanks Gui. Looks good to me.
Acked-by: Vivek Goyal <vgoyal@redhat.com>
Thanks
Vivek
> ---
> block/cfq-iosched.c | 6 ++----
> 1 files changed, 2 insertions(+), 4 deletions(-)
>
> diff --git a/block/cfq-iosched.c b/block/cfq-iosched.c
> index f083bda..8c28f56 100644
> --- a/block/cfq-iosched.c
> +++ b/block/cfq-iosched.c
> @@ -558,15 +558,13 @@ static inline u64 min_vdisktime(u64 min_vdisktime, u64 vdisktime)
>
> static void update_min_vdisktime(struct cfq_rb_root *st)
> {
> - u64 vdisktime = st->min_vdisktime;
> struct cfq_group *cfqg;
>
> if (st->left) {
> cfqg = rb_entry_cfqg(st->left);
> - vdisktime = min_vdisktime(vdisktime, cfqg->vdisktime);
> + st->min_vdisktime = max_vdisktime(st->min_vdisktime,
> + cfqg->vdisktime);
> }
> -
> - st->min_vdisktime = max_vdisktime(st->min_vdisktime, vdisktime);
> }
>
> /*
> --
> 1.7.1
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] cfq-iosched: Fix update_vdisktime logic
2011-01-25 21:26 ` Vivek Goyal
@ 2011-03-07 1:35 ` Gui Jianfeng
2011-03-07 8:28 ` Jens Axboe
0 siblings, 1 reply; 4+ messages in thread
From: Gui Jianfeng @ 2011-03-07 1:35 UTC (permalink / raw)
To: Jens Axboe; +Cc: Vivek Goyal, lkml
Vivek Goyal wrote:
> On Tue, Jan 25, 2011 at 11:27:19AM +0800, Gui Jianfeng wrote:
>> The update_vdisktime logic is broken since commit b54ce60eb7f61f8e314b8b241b0469eda3bb1d42,
>> st->min_vdisktime never makes a progress. Fix it.
>>
>> Thanks Vivek for pointing it out.
>>
>> Signed-off-by: Gui Jianfeng <guijianfen@cn.fujitsu.com>
>
> Thanks Gui. Looks good to me.
>
> Acked-by: Vivek Goyal <vgoyal@redhat.com>
Jens, Would you pick up this fix?
Thanks,
Gui
>
> Thanks
> Vivek
>
>> ---
>> block/cfq-iosched.c | 6 ++----
>> 1 files changed, 2 insertions(+), 4 deletions(-)
>>
>> diff --git a/block/cfq-iosched.c b/block/cfq-iosched.c
>> index f083bda..8c28f56 100644
>> --- a/block/cfq-iosched.c
>> +++ b/block/cfq-iosched.c
>> @@ -558,15 +558,13 @@ static inline u64 min_vdisktime(u64 min_vdisktime, u64 vdisktime)
>>
>> static void update_min_vdisktime(struct cfq_rb_root *st)
>> {
>> - u64 vdisktime = st->min_vdisktime;
>> struct cfq_group *cfqg;
>>
>> if (st->left) {
>> cfqg = rb_entry_cfqg(st->left);
>> - vdisktime = min_vdisktime(vdisktime, cfqg->vdisktime);
>> + st->min_vdisktime = max_vdisktime(st->min_vdisktime,
>> + cfqg->vdisktime);
>> }
>> -
>> - st->min_vdisktime = max_vdisktime(st->min_vdisktime, vdisktime);
>> }
>>
>> /*
>> --
>> 1.7.1
>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] cfq-iosched: Fix update_vdisktime logic
2011-03-07 1:35 ` Gui Jianfeng
@ 2011-03-07 8:28 ` Jens Axboe
0 siblings, 0 replies; 4+ messages in thread
From: Jens Axboe @ 2011-03-07 8:28 UTC (permalink / raw)
To: Gui Jianfeng; +Cc: Vivek Goyal, lkml
On 2011-03-07 02:35, Gui Jianfeng wrote:
> Vivek Goyal wrote:
>> On Tue, Jan 25, 2011 at 11:27:19AM +0800, Gui Jianfeng wrote:
>>> The update_vdisktime logic is broken since commit b54ce60eb7f61f8e314b8b241b0469eda3bb1d42,
>>> st->min_vdisktime never makes a progress. Fix it.
>>>
>>> Thanks Vivek for pointing it out.
>>>
>>> Signed-off-by: Gui Jianfeng <guijianfen@cn.fujitsu.com>
>>
>> Thanks Gui. Looks good to me.
>>
>> Acked-by: Vivek Goyal <vgoyal@redhat.com>
>
> Jens, Would you pick up this fix?
Done, applied. Thanks.
--
Jens Axboe
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2011-03-07 8:28 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-01-25 3:27 [PATCH] cfq-iosched: Fix update_vdisktime logic Gui Jianfeng
2011-01-25 21:26 ` Vivek Goyal
2011-03-07 1:35 ` Gui Jianfeng
2011-03-07 8:28 ` Jens Axboe
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.