From mboxrd@z Thu Jan 1 00:00:00 1970 From: SF Markus Elfring Subject: [PATCH 9/13] md/multipath: Adjust two function calls together with a variable assignment Date: Sun, 2 Oct 2016 14:05:12 +0200 Message-ID: <383b0acc-a093-fe89-c21d-d9a86761976b@users.sourceforge.net> References: <566ABCD9.1060404@users.sourceforge.net> <4a31d7a7-f70c-12f7-202f-963bd8706066@users.sourceforge.net> Mime-Version: 1.0 Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <4a31d7a7-f70c-12f7-202f-963bd8706066@users.sourceforge.net> Sender: kernel-janitors-owner@vger.kernel.org To: linux-raid@vger.kernel.org, Jens Axboe , NeilBrown , Shaohua Li Cc: LKML , kernel-janitors@vger.kernel.org, Julia Lawall List-Id: linux-raid.ids From: Markus Elfring Date: Sun, 2 Oct 2016 10:05:43 +0200 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 --- drivers/md/multipath.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/drivers/md/multipath.c b/drivers/md/multipath.c index 0e8939f..a5a639d 100644 --- a/drivers/md/multipath.c +++ b/drivers/md/multipath.c @@ -258,8 +258,9 @@ static int multipath_add_disk(struct mddev *mddev, struct md_rdev *rdev) print_multipath_conf(conf); - for (path = first; path <= last; path++) - if ((p=conf->multipaths+path)->rdev == NULL) { + for (path = first; path <= last; path++) { + p = conf->multipaths + path; + if (!p->rdev) { q = rdev->bdev->bd_disk->queue; disk_stack_limits(mddev->gendisk, rdev->bdev, rdev->data_offset << 9); @@ -276,6 +277,7 @@ static int multipath_add_disk(struct mddev *mddev, struct md_rdev *rdev) err = 0; break; } + } print_multipath_conf(conf); @@ -347,7 +349,8 @@ static void multipathd(struct md_thread *thread) bio = &mp_bh->bio; bio->bi_iter.bi_sector = mp_bh->master_bio->bi_iter.bi_sector; - if ((mp_bh->path = multipath_map (conf))<0) { + mp_bh->path = multipath_map(conf); + if (mp_bh->path < 0) { printk(KERN_ALERT "multipath: %s: unrecoverable IO read" " error for block %llu\n", bdevname(bio->bi_bdev,b), -- 2.10.0