From patchwork Sun Nov 12 23:15:06 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rasmus Villemoes X-Patchwork-Id: 837296 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="VKynJlZ1"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3yZqRX1rl8z9s7m for ; Mon, 13 Nov 2017 10:17:12 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751878AbdKLXQ7 (ORCPT ); Sun, 12 Nov 2017 18:16:59 -0500 Received: from mail-wm0-f65.google.com ([74.125.82.65]:33628 "EHLO mail-wm0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751391AbdKLXP1 (ORCPT ); Sun, 12 Nov 2017 18:15:27 -0500 Received: by mail-wm0-f65.google.com with SMTP id r68so12083334wmr.0 for ; Sun, 12 Nov 2017 15:15:26 -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=E9Q90kFi5CdWwPNTXsfV3QNEe+PRZlr5TaJGQkgX4ac=; b=VKynJlZ1MSfY5/zi2xqSyFcVqT45HH2u1KY9WnHJftI01oovZYwf309bBvApdFcd0P oarhOYkddLH7AX2cFxdSvmuPR2QGIk5GnsfakTA32VOmjlqRnsz6lmpoqd/FkLtY+qaR wHnwH2WgR1KSdarruwT5evtYwhWMaFuv1iB2M= 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=E9Q90kFi5CdWwPNTXsfV3QNEe+PRZlr5TaJGQkgX4ac=; b=Soy7X9QrqybR4gKVWWkBrm+VSDB7C4Tsxx9iu9fYpWuKXpv1WgGU5sVNopCweC902h 0UKTM4exAb1R9vnayvsdsDJI31v15SZiWiHdJBxTKzqDDqDYzzlmBVZBpJTarhJTYXzz 6tBtrS6CrroT6RMIyr6o0dpnmZX5FNz4AwOrZrwzU0R06d6p9xQOSaOgQbGk7EF8Rf8f PlIoA8FSGPe0VC4Kcmty+Qsfks+Xoj1kvbKM1qhfX2ZiNjmwl0rPu+PEMpDEvjgbQSG9 lOWVs99yqNvfmQzLEClg9QW2+9O86yZOrgp655opfIHu7xgSR1TbnVyZw17/VUvf0Zm0 jVxA== X-Gm-Message-State: AJaThX7WgGTVkKcuJ1I37OYV4OAMD962U7yc7pWERhToAZAozDQNtpG1 offzlbrOKYA7kiAlbFJAfb8B6w== X-Google-Smtp-Source: AGs4zMbYbb+ZsiZmhRFyFFydBLxIBsHXcrv1pQrAjUf9iEpTBoxHr6lM+wBRe4eYcN1neYdIK7UMRA== X-Received: by 10.28.107.211 with SMTP id a80mr2228823wmi.71.1510528526114; Sun, 12 Nov 2017 15:15:26 -0800 (PST) Received: from wildmoose.dk ([2a01:488:66:1000:57e6:57d1:0:1]) by smtp.gmail.com with ESMTPSA id o70sm48012169wrb.62.2017.11.12.15.15.25 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 12 Nov 2017 15:15:25 -0800 (PST) From: Rasmus Villemoes To: "David S. Miller" Cc: Rasmus Villemoes , netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 3/7] net: core: eliminate dev_alloc_name{, _ns} code duplication Date: Mon, 13 Nov 2017 00:15:06 +0100 Message-Id: <20171112231511.4666-4-linux@rasmusvillemoes.dk> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20171112231511.4666-1-linux@rasmusvillemoes.dk> References: <20171112231511.4666-1-linux@rasmusvillemoes.dk> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org dev_alloc_name contained a BUG_ON(), which I moved to dev_alloc_name_ns; the only other caller of that already has the same BUG_ON. Signed-off-by: Rasmus Villemoes --- net/core/dev.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/net/core/dev.c b/net/core/dev.c index 240ae6bc1097..1077bfe97bde 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -1112,6 +1112,7 @@ static int dev_alloc_name_ns(struct net *net, char buf[IFNAMSIZ]; int ret; + BUG_ON(!net); ret = __dev_alloc_name(net, name, buf); if (ret >= 0) strlcpy(dev->name, buf, IFNAMSIZ); @@ -1134,16 +1135,7 @@ static int dev_alloc_name_ns(struct net *net, int dev_alloc_name(struct net_device *dev, const char *name) { - char buf[IFNAMSIZ]; - struct net *net; - int ret; - - BUG_ON(!dev_net(dev)); - net = dev_net(dev); - ret = __dev_alloc_name(net, name, buf); - if (ret >= 0) - strlcpy(dev->name, buf, IFNAMSIZ); - return ret; + return dev_alloc_name_ns(dev_net(dev), dev, name); } EXPORT_SYMBOL(dev_alloc_name);