diff options
| author | Bart Van Assche <Bart.VanAssche@sandisk.com> | 2017-01-02 17:48:47 +0100 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2017-01-02 17:48:47 +0100 |
| commit | 9eca53508a157c6b6fdb6e06796902cf8a920d29 (patch) | |
| tree | ae395ad008f1a44e6134d46f12407cad47c19112 /block/blk-wbt.c | |
| parent | block: Make wbt_wait() definition consistent with declaration (diff) | |
| download | linux-9eca53508a157c6b6fdb6e06796902cf8a920d29.tar.xz linux-9eca53508a157c6b6fdb6e06796902cf8a920d29.zip | |
block: Avoid that sparse complains about context imbalance in __wbt_wait()
This patch does not change any functionality.
Fixes: e34cbd307477 ("blk-wbt: add general throttling mechanism")
Signed-off-by: Bart Van Assche <bart.vanassche@sandisk.com>
Signed-off-by: Jens Axboe <axboe@fb.com>
Diffstat (limited to 'block/blk-wbt.c')
| -rw-r--r-- | block/blk-wbt.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/block/blk-wbt.c b/block/blk-wbt.c index fd28c2806406..f0a9c07b4c7a 100644 --- a/block/blk-wbt.c +++ b/block/blk-wbt.c @@ -544,6 +544,8 @@ static inline bool may_queue(struct rq_wb *rwb, struct rq_wait *rqw, * the timer to kick off queuing again. */ static void __wbt_wait(struct rq_wb *rwb, unsigned long rw, spinlock_t *lock) + __releases(lock) + __acquires(lock) { struct rq_wait *rqw = get_rq_wait(rwb, current_is_kswapd()); DEFINE_WAIT(wait); @@ -558,13 +560,12 @@ static void __wbt_wait(struct rq_wb *rwb, unsigned long rw, spinlock_t *lock) if (may_queue(rwb, rqw, &wait, rw)) break; - if (lock) + if (lock) { spin_unlock_irq(lock); - - io_schedule(); - - if (lock) + io_schedule(); spin_lock_irq(lock); + } else + io_schedule(); } while (1); finish_wait(&rqw->wait, &wait); |