From patchwork Wed Nov 26 02:25:58 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhu Yanjun X-Patchwork-Id: 414965 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id DA97D14017B for ; Wed, 26 Nov 2014 13:26:15 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751772AbaKZC0M (ORCPT ); Tue, 25 Nov 2014 21:26:12 -0500 Received: from mail-pd0-f177.google.com ([209.85.192.177]:62687 "EHLO mail-pd0-f177.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750938AbaKZC0L (ORCPT ); Tue, 25 Nov 2014 21:26:11 -0500 Received: by mail-pd0-f177.google.com with SMTP id ft15so1772078pdb.8 for ; Tue, 25 Nov 2014 18:26:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=21nCZqKThUqvLrGuq7SV5DjA5x46eXgplkWr/1A4u44=; b=rx8qJGh1HelnoDNzVhJRmWW/UCyqSUojFoqGsPZ5CmAoSiETfPlt9RQoGXI/eVl2qC L2jTQJm8RhLI7Q+NKMlrbBkKJIOfONtyJw59W2QiyZM5lLHEmp/tFPLduLybMfdZdXbC uIQB8sdDKDTvPX5uTEBMYltWlLnAjb4vOC2hWSy5cAu0lwaDrpHnY8qt5v3U2DVgSU59 Zj0s6vUMBf4+sn6HkPhrEKYof9qZKZ3E+3537RpMoT9+FYuMePyec1kidJA9BJNfX6uC Qrop6u82N6etPuK1dSGoUoCafKYXEBGt8xGuxwz7sDa85LIcJc7nHVrhCQ7lw3oaL1Gm sLZQ== X-Received: by 10.68.69.48 with SMTP id b16mr47594974pbu.59.1416968770635; Tue, 25 Nov 2014 18:26:10 -0800 (PST) Received: from wind-OptiPlex-780.corp.ad.wrs.com ([106.120.101.38]) by mx.google.com with ESMTPSA id hj2sm2669103pbc.69.2014.11.25.18.26.05 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 25 Nov 2014 18:26:09 -0800 (PST) From: Zhu Yanjun X-Google-Original-From: Zhu Yanjun To: zyjzyj2000@gmail.com, netdev@vger.kernel.org, davem@davemloft.net Cc: Zhu Yanjun , Hong Zhiguo , Octavian Purdila , Pavel Emelyanov , Cong Wang Subject: [PATCH V3 1/1] ipv6: Remove unnecessary test Date: Wed, 26 Nov 2014 10:25:58 +0800 Message-Id: <1416968758-19641-1-git-send-email-Yanjun.Zhu@windriver.com> X-Mailer: git-send-email 1.9.1 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The "init_net" test in function addrconf_exit_net is introduced in commit 44a6bd29 [Create ipv6 devconf-s for namespaces] to avoid freeing init_net. In commit c900a800 [ipv6: fix bad free of addrconf_init_net], function addrconf_init_net will allocate memory for every net regardless of init_net. In this case, it is unnecessary to make "init_net" test. CC: Hong Zhiguo CC: Octavian Purdila CC: Pavel Emelyanov CC: Cong Wang Suggested-by: David S. Miller Signed-off-by: Zhu Yanjun --- net/ipv6/addrconf.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c index 0169ccf..b8724fc 100644 --- a/net/ipv6/addrconf.c +++ b/net/ipv6/addrconf.c @@ -5336,10 +5336,8 @@ static void __net_exit addrconf_exit_net(struct net *net) __addrconf_sysctl_unregister(net->ipv6.devconf_dflt); __addrconf_sysctl_unregister(net->ipv6.devconf_all); #endif - if (!net_eq(net, &init_net)) { - kfree(net->ipv6.devconf_dflt); - kfree(net->ipv6.devconf_all); - } + kfree(net->ipv6.devconf_dflt); + kfree(net->ipv6.devconf_all); } static struct pernet_operations addrconf_ops = {