]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commitdiff
blk-throttle: Adjust two function calls together with a variable assignment
authorMarkus Elfring <elfring@users.sourceforge.net>
Sat, 21 Jan 2017 21:15:33 +0000 (22:15 +0100)
committerJens Axboe <axboe@fb.com>
Mon, 23 Jan 2017 15:32:15 +0000 (08:32 -0700)
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>
block/blk-throttle.c

index a6bb4fe326c39b2a996fe4330bc15933451d6503..82fd0cc394ebd9d6ad3a0e02b9d5556baccc14c4 100644 (file)
@@ -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);