From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751789AbcJAHpD (ORCPT ); Sat, 1 Oct 2016 03:45:03 -0400 Received: from mout.web.de ([217.72.192.78]:54279 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750750AbcJAHoy (ORCPT ); Sat, 1 Oct 2016 03:44:54 -0400 Subject: [PATCH 2/9] md/dm-table: Reduce the scope for a variable in dm_table_verify_integrity() To: dm-devel@redhat.com, linux-raid@vger.kernel.org, Alasdair Kergon , Mike Snitzer , Shaohua Li References: <45984567-4421-5f8d-ddf3-eb2a769a1860@users.sourceforge.net> Cc: LKML , kernel-janitors@vger.kernel.org, Julia Lawall From: SF Markus Elfring Message-ID: <18a48c67-962d-2e61-7d24-dc145ec90935@users.sourceforge.net> Date: Sat, 1 Oct 2016 09:44:40 +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: <45984567-4421-5f8d-ddf3-eb2a769a1860@users.sourceforge.net> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-Provags-ID: V03:K0:ILJ0ZVF6w2nnF0ijFXRTNGfHHJznN7i3dxpZ6kyUvUdjPY1Zhjp M9STaR2eE6pktUxj5c1Wdptyaqqahb87BToVPx+hU13rpjvnNnKTPpAdcQllOwBJZQSfZYt /f5apdvPOu1P4WGGlp/6HAE0JJdyxRN1ontCHCbUnzN6kVf7C1PZ3MiZZeUvbFL64e23ItV AcYgt8F4ChGXTyUi6toGA== X-UI-Out-Filterresults: notjunk:1;V01:K0:UZM1uBO+9W0=:Irig1Ze4uNT4sDYOyTqKKV STCssuMz1uBWC77KVkZvaeEpN1Kt6s1f0K80pOed1Sl1YX4hLoAfPOyjTQUvZC4TIx4E1MR33 VbC+SnbR9onMu1SVbGrax0N4wmisd1btVumzLm13IuCuuZd/ayv1TO8g3PpEcAXu66Erd2n51 i0JXlA0Ln3eqIw5w//9LpsXhuZtvjpKDEYIPQ6iDQTy2uTntkKTSXLroRSBuPa/T8Z5gv2hiZ EzxXOLhL1503jwSsFw6RPU/evdio8HJuCX1lx6mV/Jcs8SefJ6kV9UVS/fE81ZHhJ4VJGmWni lAO000lZ5vOsoRdt8dZFo0hCzt8qs9K1psnLw87AOURgq++jASKpC1DcPLPA+lYl6WAe0KWCC mLa1cncBquGi85qnoh6auzZqaVaQrdyAd1hYhoFeQuDZNzrcIGFth2Dr9BKktRUkohr4ZffRd r92o9OJ3docXUmdvBqVWy15sKZGrwKmKWksann75WQHZj4z/rVy28U77EukqByxbKbB0ZhYPU EEi16esOhYmTZegK88D4MEsDhCmHQ+MF6P4hm4EqokQyOHW2dq5abPw5INEpVYe/Ejt53eUDz AFTTnQg/dIKK1iZuUtVMMSh72vnY//z1sEVJtl9Zhg3QiU2bG0PTzDzVSAbQQ97Cz3T77YeeF zUfNJGdqcQzmay0NYAUPkxg2QdXNZfOgJvZ8CAe4y3l0VGsDB1apiTVbZfzZ8DPR2AI3c88qc xt8zRd+FtRHa3uJmf+i/qms5mpX71/8Oy2fmqhlPnVH4N6jX5KSHtIl9LuqHdkazSz6D/Anyp 4NC/7Q6 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring Date: Sat, 1 Oct 2016 07:10:43 +0200 Move the definition for the variable "template_disk" into an if branch so that an extra initialisation can be avoided at the beginning by this refactoring. Signed-off-by: Markus Elfring --- drivers/md/dm-table.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/md/dm-table.c b/drivers/md/dm-table.c index f6b817c..73d38d0 100644 --- a/drivers/md/dm-table.c +++ b/drivers/md/dm-table.c @@ -1391,14 +1391,13 @@ int dm_calculate_queue_limits(struct dm_table *table, */ static void dm_table_verify_integrity(struct dm_table *t) { - struct gendisk *template_disk = NULL; - if (t->integrity_supported) { /* * Verify that the original integrity profile * matches all the devices in this table. */ - template_disk = dm_table_get_integrity_disk(t); + struct gendisk *template_disk = dm_table_get_integrity_disk(t); + if (template_disk && blk_integrity_compare(dm_disk(t->md), template_disk) >= 0) return; -- 2.10.0