From patchwork Tue Nov 21 00:34:38 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rasmus Villemoes X-Patchwork-Id: 839873 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=rasmusvillemoes.dk header.i=@rasmusvillemoes.dk header.b="c1mFR91b"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3ygmpd6WfMz9ryT for ; Tue, 21 Nov 2017 11:35:53 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752035AbdKUAfw (ORCPT ); Mon, 20 Nov 2017 19:35:52 -0500 Received: from mail-wr0-f194.google.com ([209.85.128.194]:39935 "EHLO mail-wr0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751956AbdKUAfO (ORCPT ); Mon, 20 Nov 2017 19:35:14 -0500 Received: by mail-wr0-f194.google.com with SMTP id 11so6387542wrb.6 for ; Mon, 20 Nov 2017 16:35:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rasmusvillemoes.dk; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=1UytCqySReS3IegsqmPsrnSyyeQaTShiHrAzxN0/K4o=; b=c1mFR91bMq+z/YRNx91m6TTvZYfgVq6KsGuR2nQZezyPuo92B0DbtTBJ8VX9trd4R/ 3/MGBtoVR5PhJqgBHGvMW6/8wfPlppnpbnkj764djIN17+vPKs1wYgFl/lE+pSxqsW8w 7vX/vMfOXpdprO67TrRCfs/1eX5dFuZu0YUbI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=1UytCqySReS3IegsqmPsrnSyyeQaTShiHrAzxN0/K4o=; b=VNXY9Djf7WT/+n+bsCSgRu18ODMdH+4ashJSoyUzgFWMPZHg3WFu6yN4NJyYrl0N1g RdtkfIa2RAjYLAI9bsujY6GPLldSYt/DXFwAa3jKYqa2jcgqZmK40ey+0G7yv/Mih95o D99yDY7VGCktk/I4aVhQ5Gr9AAOuC2DRa+laHLo0Qz3MBHWsopzEpBQKsrRhamwrcZlh KESSyWHDXIRkvgMoBrUk9ikWKpUWX16Yiu+UNqumOuWK+0cipDNtCxx/rGBlzpyGQ1+v E623ME30SR209ZUyeTUGBYEP47JUvnbffjRYoUFxLqP1gOS3DuYlTUBjzZtyJc97KlI6 l3og== X-Gm-Message-State: AJaThX48uh0JLloK3ZCTg9Tzpq592GNdn253vknGBsBOQmzzlckdVbu0 UVUFuCg5KKCON2V8/CnZisfYFA== X-Google-Smtp-Source: AGs4zMZisCOCk/rvg+n0VF8Lya4fMOVlOPnB2HMVsiwSsrV0mb/l+dWqxB0x/j9Qfx+QMUVfBeWA2A== X-Received: by 10.223.191.13 with SMTP id p13mr13749506wrh.69.1511224513526; Mon, 20 Nov 2017 16:35:13 -0800 (PST) Received: from wildmoose.dk ([2a01:488:66:1000:57e6:57d1:0:1]) by smtp.gmail.com with ESMTPSA id r63sm16353527wmg.13.2017.11.20.16.35.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 20 Nov 2017 16:35:13 -0800 (PST) From: Rasmus Villemoes To: "David S. Miller" Cc: Rasmus Villemoes , netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/3] net: use dev_alloc_name_ns instead of dev_get_valid_name Date: Tue, 21 Nov 2017 01:34:38 +0100 Message-Id: <20171121003439.10974-2-linux@rasmusvillemoes.dk> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20171121003439.10974-1-linux@rasmusvillemoes.dk> References: <20171121003439.10974-1-linux@rasmusvillemoes.dk> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The latter is simply a wrapper for the former; no need to keep both, so call dev_alloc_name_ns directly. Signed-off-by: Rasmus Villemoes --- drivers/net/tun.c | 2 +- net/core/dev.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/net/tun.c b/drivers/net/tun.c index 6bb1e604aadd..849a95505f80 100644 --- a/drivers/net/tun.c +++ b/drivers/net/tun.c @@ -2253,7 +2253,7 @@ static int tun_set_iff(struct net *net, struct file *file, struct ifreq *ifr) if (!dev) return -ENOMEM; - err = dev_get_valid_name(net, dev, name); + err = dev_alloc_name_ns(net, dev, name); if (err < 0) goto err_free_dev; diff --git a/net/core/dev.c b/net/core/dev.c index 9575e7329823..0de42f39d280 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -1183,7 +1183,7 @@ int dev_change_name(struct net_device *dev, const char *newname) memcpy(oldname, dev->name, IFNAMSIZ); - err = dev_get_valid_name(net, dev, newname); + err = dev_alloc_name_ns(net, dev, newname); if (err < 0) { write_seqcount_end(&devnet_rename_seq); return err; @@ -7615,7 +7615,7 @@ int register_netdevice(struct net_device *dev) spin_lock_init(&dev->addr_list_lock); netdev_set_addr_lockdep_class(dev); - ret = dev_get_valid_name(net, dev, dev->name); + ret = dev_alloc_name_ns(net, dev, dev->name); if (ret < 0) goto out; @@ -8354,7 +8354,7 @@ int dev_change_net_namespace(struct net_device *dev, struct net *net, const char /* We get here if we can't use the current device name */ if (!pat) goto out; - if (dev_get_valid_name(net, dev, pat) < 0) + if (dev_alloc_name_ns(net, dev, pat) < 0) goto out; }