Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d609af3a authored Jan 21, 2017 by Markus Elfring Committed by Jens Axboe Jan 23, 2017

blk-throttle: Adjust two function calls together with a variable assignment



The script "checkpatch.pl" pointed information out like the following.

ERROR: do not use assignment in if condition

Thus fix the affected source code places.

Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
Reviewed-by: Johannes Thumshirn <jthumshirn@suse.de>
Signed-off-by: Jens Axboe <axboe@fb.com>

parent 4d608baa

block/blk-throttle.c

+4 −2

Original line number	Diff line number	Diff line
		@@ -866,10 +866,12 @@ static void tg_update_disptime(struct throtl_grp *tg)
		unsigned long read_wait = -1, write_wait = -1, min_wait = -1, disptime;
		struct bio *bio;

		if ((bio = throtl_peek_queued(&sq->queued[READ])))
		bio = throtl_peek_queued(&sq->queued[READ]);
		if (bio)
		tg_may_dispatch(tg, bio, &read_wait);

		if ((bio = throtl_peek_queued(&sq->queued[WRITE])))
		bio = throtl_peek_queued(&sq->queued[WRITE]);
		if (bio)
		tg_may_dispatch(tg, bio, &write_wait);

		min_wait = min(read_wait, write_wait);