lkml.org 
[lkml]   [2012]   [Mar]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 01/11] block: use lockdep_assert_held for queue locking
    Date
    From: Andi Kleen <ak@linux.intel.com>

    Instead of an ugly open coded variant.

    Cc: axboe@kernel.dk
    Signed-off-by: Andi Kleen <ak@linux.intel.com>
    ---
    block/blk-throttle.c | 2 +-
    include/linux/blkdev.h | 18 +++++++-----------
    2 files changed, 8 insertions(+), 12 deletions(-)

    diff --git a/block/blk-throttle.c b/block/blk-throttle.c
    index 5eed6a7..f2ddb94 100644
    --- a/block/blk-throttle.c
    +++ b/block/blk-throttle.c
    @@ -1218,7 +1218,7 @@ void blk_throtl_drain(struct request_queue *q)
    struct bio_list bl;
    struct bio *bio;

    - WARN_ON_ONCE(!queue_is_locked(q));
    + queue_lockdep_assert_held(q);

    bio_list_init(&bl);

    diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
    index 606cf33..2aa2466 100644
    --- a/include/linux/blkdev.h
    +++ b/include/linux/blkdev.h
    @@ -426,14 +426,10 @@ struct request_queue {
    (1 << QUEUE_FLAG_SAME_COMP) | \
    (1 << QUEUE_FLAG_ADD_RANDOM))

    -static inline int queue_is_locked(struct request_queue *q)
    +static inline void queue_lockdep_assert_held(struct request_queue *q)
    {
    -#ifdef CONFIG_SMP
    - spinlock_t *lock = q->queue_lock;
    - return lock && spin_is_locked(lock);
    -#else
    - return 1;
    -#endif
    + if (q->queue_lock)
    + lockdep_assert_held(q->queue_lock);
    }

    static inline void queue_flag_set_unlocked(unsigned int flag,
    @@ -445,7 +441,7 @@ static inline void queue_flag_set_unlocked(unsigned int flag,
    static inline int queue_flag_test_and_clear(unsigned int flag,
    struct request_queue *q)
    {
    - WARN_ON_ONCE(!queue_is_locked(q));
    + queue_lockdep_assert_held(q);

    if (test_bit(flag, &q->queue_flags)) {
    __clear_bit(flag, &q->queue_flags);
    @@ -458,7 +454,7 @@ static inline int queue_flag_test_and_clear(unsigned int flag,
    static inline int queue_flag_test_and_set(unsigned int flag,
    struct request_queue *q)
    {
    - WARN_ON_ONCE(!queue_is_locked(q));
    + queue_lockdep_assert_held(q);

    if (!test_bit(flag, &q->queue_flags)) {
    __set_bit(flag, &q->queue_flags);
    @@ -470,7 +466,7 @@ static inline int queue_flag_test_and_set(unsigned int flag,

    static inline void queue_flag_set(unsigned int flag, struct request_queue *q)
    {
    - WARN_ON_ONCE(!queue_is_locked(q));
    + queue_lockdep_assert_held(q);
    __set_bit(flag, &q->queue_flags);
    }

    @@ -487,7 +483,7 @@ static inline int queue_in_flight(struct request_queue *q)

    static inline void queue_flag_clear(unsigned int flag, struct request_queue *q)
    {
    - WARN_ON_ONCE(!queue_is_locked(q));
    + queue_lockdep_assert_held(q);
    __clear_bit(flag, &q->queue_flags);
    }

    --
    1.7.7.6


    \
     
     \ /
      Last update: 2012-03-16 20:07    [W:0.021 / U:36.836 seconds]
    ©2003-2017 Jasper Spaans. hosted at Digital OceanAdvertise on this site