From patchwork Tue Nov 21 00:34:37 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rasmus Villemoes X-Patchwork-Id: 839872 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="diI62HS8"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3ygmpV4jg8z9ryT for ; Tue, 21 Nov 2017 11:35:46 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751980AbdKUAfP (ORCPT ); Mon, 20 Nov 2017 19:35:15 -0500 Received: from mail-wr0-f195.google.com ([209.85.128.195]:43358 "EHLO mail-wr0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751942AbdKUAfN (ORCPT ); Mon, 20 Nov 2017 19:35:13 -0500 Received: by mail-wr0-f195.google.com with SMTP id u40so9715907wrf.10 for ; Mon, 20 Nov 2017 16:35:12 -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; bh=3tWNT+WB145JJN2jcccpEvTRA+oMgXhPM7mxoK7ndr8=; b=diI62HS8PaYPWDzm8kQNsy3/7S10K9Er1zRtk65xsibIiSe7HbKGXQOgb8OXoyZbTx tjqGvJDbjBFcfjed6PE1mLE5T6VVYUGmsbp+g5RMHjCBNsvOxEIUYWKshfOMci2si+x6 8yOQqmXwsUj5/el9VZ3Axb3fOeZ1/mcsMsOEw= 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; bh=3tWNT+WB145JJN2jcccpEvTRA+oMgXhPM7mxoK7ndr8=; b=tmjqAk/uZKN7hgBxFQ7o+CGJ7GP+6lvBZ+kaD0tL+N6tz7ar/gto3DWaUbWJyW1MLP XY+btuC8gr7K3dCZ3BAbaF9OEqoF9dqH141UCuM43h4ZN28HmMuF7GpTnhoJT1EzSP/K MbCVKbh0G80eY4V56WAZnlvkIu/AARm35ZnqvBLm2ciBrMe0ZG9OFqyTRj0qOiRr2rOU F9lDxojzA1rPawYuTRrQ1V/FptaxvVLgAi2mbo8Wm8Eptn6x7CF+opJkQiFEQE8qPB2D LNc7eUXGIz3GQlPPfDJGbPNeE1M38bkn3Pqinc8SGww9iXMdPUsLJEcqTZvKl26iJE/N wjow== X-Gm-Message-State: AJaThX6m2CruFye8oqeXOwYnCl7VV1VROGkoqfmCMXijhLB44W87juff jNc8UrbKp1x2wqBTX94Y16qbKplQ X-Google-Smtp-Source: AGs4zMZzWymw+KR33zW+Mx1R89zToGk8HEHCkq8120mITAnMC4vv47/IAV3KyJNzDN3tu5M7t9wqEg== X-Received: by 10.223.157.137 with SMTP id p9mr13419247wre.92.1511224512041; Mon, 20 Nov 2017 16:35:12 -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.10 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 20 Nov 2017 16:35:11 -0800 (PST) From: Rasmus Villemoes To: "David S. Miller" Cc: Rasmus Villemoes , netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 1/3] net: core: export dev_alloc_name_ns Date: Tue, 21 Nov 2017 01:34:37 +0100 Message-Id: <20171121003439.10974-1-linux@rasmusvillemoes.dk> X-Mailer: git-send-email 2.11.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org dev_alloc_name_ns and dev_get_valid_name now do exactly the same thing. Let's expose this functionality as dev_alloc_name_ns (obviously, a core function like this won't return an invalid name...). Signed-off-by: Rasmus Villemoes --- include/linux/netdevice.h | 1 + net/core/dev.c | 7 ++++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index 6b274bfe489f..e249d3d0ff85 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h @@ -2447,6 +2447,7 @@ struct net_device *dev_get_by_name(struct net *net, const char *name); struct net_device *dev_get_by_name_rcu(struct net *net, const char *name); struct net_device *__dev_get_by_name(struct net *net, const char *name); int dev_alloc_name(struct net_device *dev, const char *name); +int dev_alloc_name_ns(struct net *net, struct net_device *dev, const char *name); int dev_open(struct net_device *dev); void dev_close(struct net_device *dev); void dev_close_many(struct list_head *head, bool unlink); diff --git a/net/core/dev.c b/net/core/dev.c index 8ee29f4f5fa9..9575e7329823 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -1109,9 +1109,9 @@ static int __dev_alloc_name(struct net *net, const char *name, char *buf) return p ? -ENFILE : -EEXIST; } -static int dev_alloc_name_ns(struct net *net, - struct net_device *dev, - const char *name) +int dev_alloc_name_ns(struct net *net, + struct net_device *dev, + const char *name) { char buf[IFNAMSIZ]; int ret; @@ -1122,6 +1122,7 @@ static int dev_alloc_name_ns(struct net *net, strlcpy(dev->name, buf, IFNAMSIZ); return ret; } +EXPORT_SYMBOL(dev_alloc_name_ns); /** * dev_alloc_name - allocate a name for a device 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; } From patchwork Tue Nov 21 00:34:39 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rasmus Villemoes X-Patchwork-Id: 839871 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="cy6yn/Tj"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3ygmpH6Jh5z9s1h for ; Tue, 21 Nov 2017 11:35:35 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752055AbdKUAfV (ORCPT ); Mon, 20 Nov 2017 19:35:21 -0500 Received: from mail-wm0-f66.google.com ([74.125.82.66]:42496 "EHLO mail-wm0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752010AbdKUAfQ (ORCPT ); Mon, 20 Nov 2017 19:35:16 -0500 Received: by mail-wm0-f66.google.com with SMTP id 5so21006326wmk.1 for ; Mon, 20 Nov 2017 16:35:15 -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=fP7jueDUK7BM/UnXUk75D3rL+l2piio9CsUz8Begfzk=; b=cy6yn/TjqCfzWkdQb3eEzWO7tOkoDtVJBHI/JImbnj5VMUcbhF9rN4wxN1vv+38HzG KCwh0vVAZQHbmvS5Z0djnusSzvo++UgjJ/tx5Up5FhlLadF0lLn4ShCXkCaG2tCy9JoH 2NIuCi+fcVv8sR00xgui1kdrKwfI4DGOjrRWo= 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=fP7jueDUK7BM/UnXUk75D3rL+l2piio9CsUz8Begfzk=; b=HuHZCbjuLh5YEOiMbmEjmi6nE9FZ8ERZ3xDMCvdpkj97mbsghdIUDART7PTmjVLs/W ++cRQsLeDBbpuV/4JpTUB5DsR8m7OPyUdjDEHJHG3OPRFNTOO/XOiAw8GKECWuy5IfSs kYcQXuVr3ny/1bf0of99B010Sxa+R6I7rxrPzN6g7CtxSQZMb92MtgW6KhBbEZ+HbIr4 ZhmOb+F1lyItvGb+OxjLqyYihHvs/JRUNIt4Zx7oYDw58NIBqhpNpGpfIZQat3MC8exP +NtVQ+vdd7AZxGoI7MzJT70UVoJplynanKJ2xacfOHyp9zNAOfdOVHivk9p0qa+DRvV4 vyDw== X-Gm-Message-State: AJaThX5LKyg2vF8hkGJr8lLjBS+CATfkY10KYSY57Dskg+A45hZd2o5C W3mezPgkmCNauVnXB6olYXp44/oC X-Google-Smtp-Source: AGs4zMbcC7UgN3pP81nroJcCOAEJDUom21bLedcNeq2eJpypCJ5UEzbAdTCcY9PFQtO2l+IFAqUrsw== X-Received: by 10.28.12.75 with SMTP id 72mr11159159wmm.133.1511224515279; Mon, 20 Nov 2017 16:35:15 -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.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 20 Nov 2017 16:35:14 -0800 (PST) From: Rasmus Villemoes To: "David S. Miller" Cc: Rasmus Villemoes , netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 3/3] net: core: remove dev_get_valid_name Date: Tue, 21 Nov 2017 01:34:39 +0100 Message-Id: <20171121003439.10974-3-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 No users left. Signed-off-by: Rasmus Villemoes --- include/linux/netdevice.h | 2 -- net/core/dev.c | 7 ------- 2 files changed, 9 deletions(-) diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index e249d3d0ff85..7b057ef42906 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h @@ -3732,8 +3732,6 @@ struct net_device *alloc_netdev_mqs(int sizeof_priv, const char *name, unsigned char name_assign_type, void (*setup)(struct net_device *), unsigned int txqs, unsigned int rxqs); -int dev_get_valid_name(struct net *net, struct net_device *dev, - const char *name); #define alloc_netdev(sizeof_priv, name, name_assign_type, setup) \ alloc_netdev_mqs(sizeof_priv, name, name_assign_type, setup, 1, 1) diff --git a/net/core/dev.c b/net/core/dev.c index 0de42f39d280..405598c27195 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -1144,13 +1144,6 @@ int dev_alloc_name(struct net_device *dev, const char *name) } EXPORT_SYMBOL(dev_alloc_name); -int dev_get_valid_name(struct net *net, struct net_device *dev, - const char *name) -{ - return dev_alloc_name_ns(net, dev, name); -} -EXPORT_SYMBOL(dev_get_valid_name); - /** * dev_change_name - change name of a device * @dev: device