lkml.org 
[lkml]   [2009]   [Jul]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 7/7] sched: Convert the only user of cond_resched_bkl to use cond_resched()
    Date
    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>
    ---
    fs/locks.c | 2 +-
    include/linux/sched.h | 2 --
    2 files changed, 1 insertions(+), 3 deletions(-)

    diff --git a/fs/locks.c b/fs/locks.c
    index 09502f3..0fb66dd 100644
    --- a/fs/locks.c
    +++ b/fs/locks.c
    @@ -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) {
    diff --git a/include/linux/sched.h b/include/linux/sched.h
    index 099408f..d7ffd3f 100644
    --- a/include/linux/sched.h
    +++ b/include/linux/sched.h
    @@ -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,
    --
    1.6.2.3


    \
     
     \ /
      Last update: 2009-07-16 08:33    [W:0.031 / U:32.248 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site