OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

block: Avoid that sparse complains about context imbalance in __wbt_wait() 

This patch does not change any functionality.

Fixes: e34cbd3074 ("blk-wbt: add general throttling mechanism")
Signed-off-by: Bart Van Assche <bart.vanassche@sandisk.com>
Signed-off-by: Jens Axboe <axboe@fb.com>
This commit is contained in:
Bart Van Assche 2017-01-02 09:48:47 -07:00 committed by Jens Axboe
parent f2e0a0b292
commit 9eca53508a
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
block/blk-wbt.c
View File

@ -544,6 +544,8 @@ static inline bool may_queue(struct rq_wb *rwb, struct rq_wait *rqw,
* the timer to kick off queuing again. * the timer to kick off queuing again.
*/ */
static void __wbt_wait(struct rq_wb *rwb, unsigned long rw, spinlock_t *lock) 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()); struct rq_wait *rqw = get_rq_wait(rwb, current_is_kswapd());
DEFINE_WAIT(wait); 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)) if (may_queue(rwb, rqw, &wait, rw))
break; break;
if (lock) if (lock) {
spin_unlock_irq(lock); spin_unlock_irq(lock);
io_schedule();
io_schedule();
if (lock)
spin_lock_irq(lock); spin_lock_irq(lock);
} else
io_schedule();
} while (1); } while (1);
finish_wait(&rqw->wait, &wait); finish_wait(&rqw->wait, &wait);