lkml.org 
[lkml]   [2015]   [Sep]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[tip:locking/core] locking/qrwlock: Rename ->lock to ->wait_lock
    Commit-ID:  6e1e5196975fb7ecc501b3fe1075b77aea2b7839
    Gitweb: http://git.kernel.org/tip/6e1e5196975fb7ecc501b3fe1075b77aea2b7839
    Author: Davidlohr Bueso <dave@stgolabs.net>
    AuthorDate: Mon, 14 Sep 2015 00:37:22 -0700
    Committer: Ingo Molnar <mingo@kernel.org>
    CommitDate: Fri, 18 Sep 2015 09:27:29 +0200

    locking/qrwlock: Rename ->lock to ->wait_lock

    ... trivial, but reads a little nicer when we name our
    actual primitive 'lock'.

    Signed-off-by: Davidlohr Bueso <dbueso@suse.de>
    Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
    Cc: Andrew Morton <akpm@linux-foundation.org>
    Cc: Linus Torvalds <torvalds@linux-foundation.org>
    Cc: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
    Cc: Peter Zijlstra <peterz@infradead.org>
    Cc: Thomas Gleixner <tglx@linutronix.de>
    Cc: Waiman Long <Waiman.Long@hpe.com>
    Link: http://lkml.kernel.org/r/1442216244-4409-1-git-send-email-dave@stgolabs.net
    Signed-off-by: Ingo Molnar <mingo@kernel.org>
    ---
    include/asm-generic/qrwlock_types.h | 4 ++--
    kernel/locking/qrwlock.c | 8 ++++----
    2 files changed, 6 insertions(+), 6 deletions(-)

    diff --git a/include/asm-generic/qrwlock_types.h b/include/asm-generic/qrwlock_types.h
    index 4d76f24..0abc6b6 100644
    --- a/include/asm-generic/qrwlock_types.h
    +++ b/include/asm-generic/qrwlock_types.h
    @@ -10,12 +10,12 @@

    typedef struct qrwlock {
    atomic_t cnts;
    - arch_spinlock_t lock;
    + arch_spinlock_t wait_lock;
    } arch_rwlock_t;

    #define __ARCH_RW_LOCK_UNLOCKED { \
    .cnts = ATOMIC_INIT(0), \
    - .lock = __ARCH_SPIN_LOCK_UNLOCKED, \
    + .wait_lock = __ARCH_SPIN_LOCK_UNLOCKED, \
    }

    #endif /* __ASM_GENERIC_QRWLOCK_TYPES_H */
    diff --git a/kernel/locking/qrwlock.c b/kernel/locking/qrwlock.c
    index f17a3e3..fec0823 100644
    --- a/kernel/locking/qrwlock.c
    +++ b/kernel/locking/qrwlock.c
    @@ -86,7 +86,7 @@ void queued_read_lock_slowpath(struct qrwlock *lock, u32 cnts)
    /*
    * Put the reader into the wait queue
    */
    - arch_spin_lock(&lock->lock);
    + arch_spin_lock(&lock->wait_lock);

    /*
    * The ACQUIRE semantics of the following spinning code ensure
    @@ -99,7 +99,7 @@ void queued_read_lock_slowpath(struct qrwlock *lock, u32 cnts)
    /*
    * Signal the next one in queue to become queue head
    */
    - arch_spin_unlock(&lock->lock);
    + arch_spin_unlock(&lock->wait_lock);
    }
    EXPORT_SYMBOL(queued_read_lock_slowpath);

    @@ -112,7 +112,7 @@ void queued_write_lock_slowpath(struct qrwlock *lock)
    u32 cnts;

    /* Put the writer into the wait queue */
    - arch_spin_lock(&lock->lock);
    + arch_spin_lock(&lock->wait_lock);

    /* Try to acquire the lock directly if no reader is present */
    if (!atomic_read(&lock->cnts) &&
    @@ -144,6 +144,6 @@ void queued_write_lock_slowpath(struct qrwlock *lock)
    cpu_relax_lowlatency();
    }
    unlock:
    - arch_spin_unlock(&lock->lock);
    + arch_spin_unlock(&lock->wait_lock);
    }
    EXPORT_SYMBOL(queued_write_lock_slowpath);

    \
     
     \ /
      Last update: 2015-09-18 11:21    [W:4.187 / U:0.864 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site