Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1754089AbdF0X60 (ORCPT <rfc822;w@1wt.eu>);
        Tue, 27 Jun 2017 19:58:26 -0400
Received: from mail-pg0-f41.google.com ([74.125.83.41]:35871 "EHLO
        mail-pg0-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1753978AbdF0X6U (ORCPT
        <rfc822;linux-kernel@vger.kernel.org>);
        Tue, 27 Jun 2017 19:58:20 -0400
Subject: Re: [PATCH 3/9] drbd: Drop unnecessary static
To: Kees Cook <keescook@chromium.org>,
        Roland Kammerer <roland.kammerer@linbit.com>
Cc: Julia Lawall <Julia.Lawall@lip6.fr>,
        Philipp Reisner <philipp.reisner@linbit.com>,
        kernel-janitors@vger.kernel.org,
        Lars Ellenberg <lars.ellenberg@linbit.com>, drbd-dev@lists.linbit.com,
        LKML <linux-kernel@vger.kernel.org>
References: <1493928654-18768-1-git-send-email-Julia.Lawall@lip6.fr>
 <1493928654-18768-4-git-send-email-Julia.Lawall@lip6.fr>
 <20170505071945.GB6818@rck.sh>
 <CAGXu5jKzvy2deqGYTjHh6z2SUcbneJmRr9hs0zoYsxyuiqfP9A@mail.gmail.com>
From: Jens Axboe <axboe@kernel.dk>
Message-ID: <a7dbb81a-fef3-fa6f-c92e-c6b0f65a94a1@kernel.dk>
Date: Tue, 27 Jun 2017 17:58:16 -0600
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101
 Thunderbird/52.1.1
MIME-Version: 1.0
In-Reply-To: <CAGXu5jKzvy2deqGYTjHh6z2SUcbneJmRr9hs0zoYsxyuiqfP9A@mail.gmail.com>
Content-Type: text/plain; charset=utf-8
Content-Language: en-US
Content-Transfer-Encoding: 7bit
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
Content-Length: 2230
Lines: 79

On 06/27/2017 05:49 PM, Kees Cook wrote:
> On Fri, May 5, 2017 at 12:19 AM, Roland Kammerer
> <roland.kammerer@linbit.com> wrote:
>> On Thu, May 04, 2017 at 10:10:48PM +0200, Julia Lawall wrote:
>>> Drop static on a local variable, when the variable is initialized before
>>> any use, on every possible execution path through the function.  The static
>>> has no benefit, and dropping it reduces the code size.
>>>
>>> The semantic patch that fixes this problem is as follows:
>>> (http://coccinelle.lip6.fr/)
>>>
>>> // <smpl>
>>> @bad exists@
>>> position p;
>>> identifier x;
>>> type T;
>>> @@
>>>
>>> static T x@p;
>>> ...
>>> x = <+...x...+>
>>>
>>> @@
>>> identifier x;
>>> expression e;
>>> type T;
>>> position p != bad.p;
>>> @@
>>>
>>> -static
>>>  T x@p;
>>>  ... when != x
>>>      when strict
>>> ?x = e;
>>> // </smpl>
>>>
>>> The change in code size is indicates by the following output from the size
>>> command.
>>>
>>> before:
>>>    text    data     bss     dec     hex filename
>>>   67299    2291    1056   70646   113f6 drivers/block/drbd/drbd_nl.o
>>>
>>> after:
>>>    text    data     bss     dec     hex filename
>>>   67283    2291    1056   70630   113e6 drivers/block/drbd/drbd_nl.o
>>>
>>> Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr>
>>>
>>> ---
>>>  drivers/block/drbd/drbd_nl.c |    2 +-
>>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>>
>>> diff --git a/drivers/block/drbd/drbd_nl.c b/drivers/block/drbd/drbd_nl.c
>>> index 02255a0..ad0fcb4 100644
>>> --- a/drivers/block/drbd/drbd_nl.c
>>> +++ b/drivers/block/drbd/drbd_nl.c
>>> @@ -2294,7 +2294,7 @@ static bool conn_ov_running(struct drbd_connection *connection)
>>>  static enum drbd_ret_code
>>>  check_net_options(struct drbd_connection *connection, struct net_conf *new_net_conf)
>>>  {
>>> -     static enum drbd_ret_code rv;
>>> +     enum drbd_ret_code rv;
>>>       struct drbd_peer_device *peer_device;
>>>       int i;
>>
>> Yes, that already got dropped for drbd9 and is obviously correct for
>> in-tree drbd8.
>>
>> Signed-off-by: Roland Kammerer <roland.kammerer@linbit.com>
>>
>> Regards, rck
> 
> Which tree should this go through? Jens, I think yours?

Yes, I'll queue it up for 4.13. Thanks Julia.

-- 
Jens Axboe