diff options
| author | Markus Elfring <elfring@users.sourceforge.net> | 2017-01-21 22:15:33 +0100 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2017-01-23 08:32:15 -0700 |
| commit | d609af3a1397511a7a2c213f9f855fa82df771ee (patch) | |
| tree | 65b4e6bc4b57675d2e29709b763f37922787ed46 /block/blk-throttle.c | |
| parent | 4d608baac5f4e72b033a122b2d6d9499532c3afc (diff) | |
| download | linux-d609af3a1397511a7a2c213f9f855fa82df771ee.tar.bz2 | |
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>
Diffstat (limited to 'block/blk-throttle.c')
| -rw-r--r-- | block/blk-throttle.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/block/blk-throttle.c b/block/blk-throttle.c index a6bb4fe326c3..82fd0cc394eb 100644 --- a/block/blk-throttle.c +++ b/block/blk-throttle.c @@ -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); |