From patchwork Fri Feb 15 14:49:47 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yafang Shao X-Patchwork-Id: 1042939 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@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; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="WCflwseo"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 441GQV4ZClz9s5c for ; Sat, 16 Feb 2019 01:50:26 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732927AbfBOOuZ (ORCPT ); Fri, 15 Feb 2019 09:50:25 -0500 Received: from mail-pl1-f193.google.com ([209.85.214.193]:41336 "EHLO mail-pl1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726139AbfBOOuY (ORCPT ); Fri, 15 Feb 2019 09:50:24 -0500 Received: by mail-pl1-f193.google.com with SMTP id k15so5062088pls.8 for ; Fri, 15 Feb 2019 06:50:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=jZLwEQvEa/hORXtxbnoGIj21yd191QB3t4njHa58Ne0=; b=WCflwseofnzKtp1YXGCELQuwGj3HkAgDguVwxFJWIMe7N3hW7alenBQTeSNixEcaNN IWJQjYin1En2WxQ69Q79Z9W+DxjmUXWYzT2wAOcVB+4Xm1hOfE2GvgDAK7xiWDOUiszl 1mrPkXeRF4CXDjmGhUC/PrSAoh9Hwno5J3RBu9ymEgnbgL2uU2lQKAX/nx4k26lpdjBX FkEDGiTPNK2raE0jnuSbj+3bW6yOgi7hzYWI5hNnBR50KTgMRAHQ8l4Il/X7I9wgA9Ly ubsS5jTtTMIU4/pZJQAoXihDLNbPQj5Ki8/TrBviwd4lVPF26p/0Ge/YXvyoQ7/oKJYr bL5A== 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=jZLwEQvEa/hORXtxbnoGIj21yd191QB3t4njHa58Ne0=; b=hSouA5zQZeLO1EQprbBU8l8LuAEZUBwILrwLQltNRclZj6Bi4U5F6UKMmPLHLmDrTw W0dKLZ4QKTs6oBziFbTQXeoK31SlVpBl+R1pGO9C9Vje2Qo2qgFV4IYh7niC/k17geFl v8vaFUGiqKGIWsP2Ohseuc/4UPljRlx/ZNtdk9qAVUwZYio4UODr+NxxYb0tuEmNQKN4 iDhZo4d1kFsK3I8iqgS0oD0pjy/Ns0EaEP697fmU2Vex50323VTrzwxiq8mNcz1C6C4w BF4Lb5Wf8HTnPYAUuRDQh1obEefPoc0X6SsjIxFcwBKq4Jcr+lpy5FHeD21sv07KPXaR dfZQ== X-Gm-Message-State: AHQUAuakq+UTcvvqCst7gfmRssWxXS6zaZ82Ru3WNe2tdUrXlKZn6/of ECILeKVc3qXMh4md/7WVOS8= X-Google-Smtp-Source: AHgI3IbHu2DIPv1QvFsLgSDhpesuWy9WBYraDmWEGi8DcnWjHPCFf828wFSJcIf745WgdGsPUfpJRw== X-Received: by 2002:a17:902:9a02:: with SMTP id v2mr7333504plp.201.1550242224237; Fri, 15 Feb 2019 06:50:24 -0800 (PST) Received: from localhost.localdomain ([203.100.54.194]) by smtp.gmail.com with ESMTPSA id k65sm1900870pge.74.2019.02.15.06.50.22 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 15 Feb 2019 06:50:23 -0800 (PST) From: Yafang Shao To: davem@davemloft.net Cc: daniel@iogearbox.net, edumazet@google.com, netdev@vger.kernel.org, shaoyafang@didiglobal.com, Yafang Shao Subject: [net-next 5/5] net: sock: remove the definition of SOCK_DEBUG() Date: Fri, 15 Feb 2019 22:49:47 +0800 Message-Id: <1550242187-29660-6-git-send-email-laoar.shao@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1550242187-29660-1-git-send-email-laoar.shao@gmail.com> References: <1550242187-29660-1-git-send-email-laoar.shao@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org As SOCK_DEBUG() isn't used any more, we can get ride of it now. Regarding the SO_DEBUG in sock_{s,g}etsockopt, I think it is better to keep as-is, because if we return an errno to tell the application that this optname isn't supported, it may break the application. The application still can use this option but don't take any effect from now on. Signed-off-by: Yafang Shao --- include/net/sock.h | 19 ------------------- net/core/sock.c | 3 +++ 2 files changed, 3 insertions(+), 19 deletions(-) diff --git a/include/net/sock.h b/include/net/sock.h index 6679f3c..4c6b599 100644 --- a/include/net/sock.h +++ b/include/net/sock.h @@ -74,25 +74,6 @@ #include #include -/* - * This structure really needs to be cleaned up. - * Most of it is for TCP, and not used by any of - * the other protocols. - */ - -/* Define this to get the SOCK_DBG debugging facility. */ -#define SOCK_DEBUGGING -#ifdef SOCK_DEBUGGING -#define SOCK_DEBUG(sk, msg...) do { if ((sk) && sock_flag((sk), SOCK_DBG)) \ - printk(KERN_DEBUG msg); } while (0) -#else -/* Validate arguments and do nothing */ -static inline __printf(2, 3) -void SOCK_DEBUG(const struct sock *sk, const char *msg, ...) -{ -} -#endif - /* This is the per-socket lock. The spinlock provides a synchronization * between user contexts and software interrupt processing, whereas the * mini-semaphore synchronizes multiple users amongst themselves. diff --git a/net/core/sock.c b/net/core/sock.c index 71ded4d..a980ff3 100644 --- a/net/core/sock.c +++ b/net/core/sock.c @@ -753,6 +753,9 @@ int sock_setsockopt(struct socket *sock, int level, int optname, switch (optname) { case SO_DEBUG: + /* This option doesn't take effect now, + * but we need to keep it for backward compatibility. + */ if (val && !capable(CAP_NET_ADMIN)) ret = -EACCES; else