From: Bart Van Assche Date: Mon, 2 Jan 2017 16:46:15 +0000 (-0700) Subject: block: Make wbt_wait() definition consistent with declaration X-Git-Tag: v4.10-rc3~27^2~2 X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=f2e0a0b292682dd94274d6793d76656b41526147;p=linux.git block: Make wbt_wait() definition consistent with declaration Fixes: e34cbd307477 ("blk-wbt: add general throttling mechanism") Signed-off-by: Bart Van Assche Signed-off-by: Jens Axboe --- diff --git a/block/blk-wbt.c b/block/blk-wbt.c index 6e82769f4042..fd28c2806406 100644 --- a/block/blk-wbt.c +++ b/block/blk-wbt.c @@ -595,7 +595,7 @@ static inline bool wbt_should_throttle(struct rq_wb *rwb, struct bio *bio) * in an irq held spinlock, if it holds one when calling this function. * If we do sleep, we'll release and re-grab it. */ -unsigned int wbt_wait(struct rq_wb *rwb, struct bio *bio, spinlock_t *lock) +enum wbt_flags wbt_wait(struct rq_wb *rwb, struct bio *bio, spinlock_t *lock) { unsigned int ret = 0;