Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752156AbcJBMFb (ORCPT ); Sun, 2 Oct 2016 08:05:31 -0400 Received: from mout.web.de ([212.227.17.11]:64092 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750858AbcJBMFX (ORCPT ); Sun, 2 Oct 2016 08:05:23 -0400 Subject: [PATCH 9/13] md/multipath: Adjust two function calls together with a variable assignment To: linux-raid@vger.kernel.org, Jens Axboe , NeilBrown , Shaohua Li References: <566ABCD9.1060404@users.sourceforge.net> <4a31d7a7-f70c-12f7-202f-963bd8706066@users.sourceforge.net> Cc: LKML , kernel-janitors@vger.kernel.org, Julia Lawall From: SF Markus Elfring Message-ID: <383b0acc-a093-fe89-c21d-d9a86761976b@users.sourceforge.net> Date: Sun, 2 Oct 2016 14:05:12 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.3.0 MIME-Version: 1.0 In-Reply-To: <4a31d7a7-f70c-12f7-202f-963bd8706066@users.sourceforge.net> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit X-Provags-ID: V03:K0:3agw0Pj+MDZnLoOrZZyrswi3cwuAONT1JsR0BMh4OSKCcZd8lEB IjKaENNkR3EFBuwGuygk7P/xvWq5UKePiiwIV2wuNGdMs6UEtIe6soOaZ9mcS32fS2cFRFG 71EjbeaKe+gqRtgZFUEB5TKI7lqTpHULtNHwTNoGdFsd7pVvFWlwx+9qi7DMgf5p478OWXN 5hqPP9gMrHRO35dJMN5dw== X-UI-Out-Filterresults: notjunk:1;V01:K0:ndcKtbcuKlE=:MNUKP8FvBZIe7IfZclNY0u +hx897MwIk3R/fgd+3rLQhObdPqYwOsiRo5nGPaZxKF9BRyZwBL9Os69lInlLzorTsARlSUlq VnhffFYKKpdlN79Z/POYQCWIzHwuQS94JIkeMvThsYXKq14zoQY4VBz9SV/cp4THUaTSRqXsl IFf+ZAzbbd3W9z0Gx38PwcLPj3dADd2DcBaNsk+ajayHmt1gL18yQmG4WaoFkaybU7V8a7xKi iWfb7+lQs3vWi+3nfnuNFUDbbK8zV5wSAiTLI5c7yTfyrCuftwu5eRK1tJQqNx5sU6wj3IOK4 ASjC3uEYPPzzHv5ew2TcMP4RpwYC4Vrwyapl4ll0Q8KHimR5bgSwTXefz8z5XtdYcronbAu1F +ghokV4tQUUen1gkUgVgPKznn6LvSGqxdcmgjDcTD6fvr5D7xVUipm6eyO9xBfyd/9rYsRb8j j8tvwjmPPcXEfXe7Hbsx0SUshYhX4bETcg/tz2N+iRkr5CoIf/nQU7IcGkerslmFw9P9wOYMi y0tFjodkIxS5UpZoGLcKYzobPOMFC3rsMw4H0I0AmcGwjc6qc3ha1k3yO7eUej7Xwnfk+xch7 kOSmFSYZZvU+6t41aMt5WfZLnpBjfXAT3ZYMQS804OCV75Nzitd9oC5WuJ2Wk2RtLNLhdLF7U /95pBeKoLZXdT+UGCNfysEaxuMIiP98ZL4lCj4DF10PIetYIGduUpHDC7vCglQr0kFAJigtu9 XKMAlT9TelsJGfpy5X7ti0vPcoHbikMW3J54hTizyNG7dHUYi57g+xybuyjlrypFThtR17P/F MkWHsfo Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1557 Lines: 50 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