adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-28 03:36:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

[PATCH] cond_resched_lock() fix

Browse source 
On one path, cond_resched_lock() fails to return true if it dropped the lock.
We think this might be causing the crashes in JBD's log_do_checkpoint().

Cc: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Jan Kara 2005-06-13 15:52:32 -07:00 committed by Linus Torvalds
parent f797f9cc54
commit 6df3cecbb9
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
kernel/sched.c
View file

@ -3755,19 +3755,22 @@ EXPORT_SYMBOL(cond_resched);
*/ */
int cond_resched_lock(spinlock_t * lock) int cond_resched_lock(spinlock_t * lock)
{ {
int ret = 0;
if (need_lockbreak(lock)) { if (need_lockbreak(lock)) {
spin_unlock(lock); spin_unlock(lock);
cpu_relax(); cpu_relax();
ret = 1;
spin_lock(lock); spin_lock(lock);
} }
if (need_resched()) { if (need_resched()) {
_raw_spin_unlock(lock); _raw_spin_unlock(lock);
preempt_enable_no_resched(); preempt_enable_no_resched();
__cond_resched(); __cond_resched();
ret = 1;
spin_lock(lock); spin_lock(lock);
return 1;
} }
return 0; return ret;
} }
EXPORT_SYMBOL(cond_resched_lock); EXPORT_SYMBOL(cond_resched_lock);