Commit def01bc5 authored Jul 16, 2009 by Frederic Weisbecker Committed by Ingo Molnar Jul 18, 2009

sched: Convert the only user of cond_resched_bkl to use cond_resched()



fs/locks.c:flock_lock_file() is the only user of
cond_resched_bkl()

This helper doesn't do anything more than cond_resched(). The
latter naming is enough to explain that we are rescheduling if
needed.

The bkl suffix suggests another semantics but it's actually a
synonym of cond_resched().

Reported-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>
Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
LKML-Reference: <1247725694-6082-7-git-send-email-fweisbec@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

parent 613afbf8

fs/locks.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -768,7 +768,7 @@ static int flock_lock_file(struct file filp, struct file_lock request)
		* give it the opportunity to lock the file.
		*/
		if (found)
		cond_resched_bkl();
		cond_resched();

		find_conflict:
		for_each_lock(inode, before) {

include/linux/sched.h

+0 −2

Original line number	Diff line number	Diff line
		@@ -2305,8 +2305,6 @@ extern int __cond_resched_softirq(void);
		__cond_resched_softirq(); \
		})

		#define cond_resched_bkl() cond_resched()

		/*
		* Does a critical section need to be broken due to another
		* task waiting?: (technically does not depend on CONFIG_PREEMPT,