async: fix __lowest_in_progress()
PATCH 1/1 async: fix __lowest_in_progress()
Quoted 1 line
From
24bafdeb8a42e2e43a1928ca72159e6ff90cfe85Mon Sep 17 00:00:00 2001
From: Arjan van de Ven <[email protected]>
Date: Sun, 11 Jan 2009 15:35:01 +0000
Subject: [PATCH] async: fix __lowest_in_progress()
At 37000 feet somewhere near Greenland I woke up from a half-sleep with the realisation that __lowest_in_progress() is buggy. After landing I checked and there were indeed 2 problems with it; this patch fixes both:
* The order of the list checks was wrong
* The locking was not correct.
Signed-off-by Arjan van de Ven <[email protected]>
--- kernel/async.c | 21 ++++++++++++++++----- 1 files changed, 16 insertions(+), 5 deletions(-)
kernel/async.c +16 -5
@@ -90,12 +90,12 @@ extern int initcall_debug;static async_cookie_t __lowest_in_progress (struct list_head *running) {struct async_entry *entry; -if (!list_empty (&async_pending)) { - entry =list_first_entry (&async_pending, +if (!list_empty (running)) { + entry =list_first_entry (running, struct async_entry, list);return entry->cookie; - }else if (!list_empty (running)) { - entry =list_first_entry (running, + }else if (!list_empty (&async_pending)) { + entry =list_first_entry (&async_pending, struct async_entry, list);return entry->cookie; }else {
@@ -104,6 +104,17 @@ static async_cookie_t __lowest_in_progress(struct list_head *running) } } + +static async_cookie_t lowest_in_progress (struct list_head *running) +{ +unsigned long flags; +async_cookie_t ret; + +spin_lock_irqsave (&async_lock, flags); + ret =__lowest_in_progress (running); +spin_unlock_irqrestore (&async_lock, flags); +return ret; +}/* * pick the first pending entry and run it */
@@ -229,7 +240,7 @@ void async_synchronize_cookie_special(async_cookie_t cookie, struct list_head *r starttime =ktime_get (); } -wait_event (async_done,__lowest_in_progress (running) >= cookie); +wait_event (async_done,lowest_in_progress (running) >= cookie);if (initcall_debug && system_state ==SYSTEM_BOOTING ) { endtime =ktime_get ();
Signature · 8 lines
1.6.0.6 -- Arjan van de Ven Intel Open Source Technology Centre For development, discussion and tips for power savings, visit http://www.lesswatts.org