From patchwork Fri May 4 02:59:30 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bo YU X-Patchwork-Id: 908457 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="mLEscK5X"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40ccDq1jPJz9s35 for ; Fri, 4 May 2018 12:59:39 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751339AbeEDC7g (ORCPT ); Thu, 3 May 2018 22:59:36 -0400 Received: from mail-pg0-f67.google.com ([74.125.83.67]:46482 "EHLO mail-pg0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751262AbeEDC7f (ORCPT ); Thu, 3 May 2018 22:59:35 -0400 Received: by mail-pg0-f67.google.com with SMTP id z4-v6so14479375pgu.13; Thu, 03 May 2018 19:59:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:from:to:cc:subject:message-id:mail-followup-to:mime-version :content-disposition:user-agent; bh=1Y9dJicVlXf9frtUGU6oItjKCavqaYCAa+OW3JMI/Q0=; b=mLEscK5XFg7RsNIYPP5BjlTvaER7zqLalBh0ieF6xuxl5GRWYPdRsgdT6vshK8L1gw Lf7IO4jXcszL6n0v88uxy8Xsn34+Vx39TQ3ZyyzY8JwV7BrtxyFDhaVPpNCZMkVfOeJY OZzMR5cnaDqvHkop0U9npG6bZPf6b8U2hYVaamsYSTM0vJGEymi+y1PWlr/EXE9MMA2q 51v5QobC4UmqPcFhnoQPsRnBvih7+kXJWlpuxKy5qFpoW9FzlyoKqnRuoutLRYAvlhtJ T5efA4Z2HsubGYfa3OjCnV3UI3yivD3/zrDIdDK7v+cnm3en/DFAJUT7RNrWWch7yQTs aspg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id :mail-followup-to:mime-version:content-disposition:user-agent; bh=1Y9dJicVlXf9frtUGU6oItjKCavqaYCAa+OW3JMI/Q0=; b=nYsOFEQv+xw5JYp28AxReEXspEeB4Iax92NGQmBB6+8uoi96fB6jJlbpCY5jscXLuQ EECPAr24pOxSuPYedaa6mJSKYcIdn899ubvN7q5rVAw3SRNyuPb6HaGUYpp/IDMNsMNX LS5THokeyq1MP7/3buN1AZkhsOzz7fbbLG1b1sOGLfKAzIJP9+YmHDBGQdJsQxAGK6Ri 2Ll2TlJddJSP7dyZ8Xo1NqPU4IkgqEln0XyHrokVJzBwFu5WoQdFaK2mwrgeKI07Y9SA rfxU0pnM9R/NU4CenDbNG+Hs26wY2Upp0QSL/pj1iSx8SumPBRNWq+QG8JmrBprmakwb +d4A== X-Gm-Message-State: ALQs6tCXuL7QQxP0sY3PPQ/OXnYxUPGzP9spldeQUW1ZPN1LCG/sg2Is iZD4VtIsCTJ5mUcsScWKXN8= X-Google-Smtp-Source: AB8JxZrphEHVVfqmEQefkK/Kz3Wy0t5oXTraItn0zKdwDGp5nY1yTo9Po1mgXIPLsa7tkjuIEOcIdQ== X-Received: by 2002:a65:5d0f:: with SMTP id e15-v6mr21517703pgr.119.1525402775063; Thu, 03 May 2018 19:59:35 -0700 (PDT) Received: from debian ([2001:250:582a:5:a008:5eab:9c8b:bbb0]) by smtp.gmail.com with ESMTPSA id l8sm26857877pff.126.2018.05.03.19.59.33 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 03 May 2018 19:59:34 -0700 (PDT) Date: Thu, 3 May 2018 22:59:30 -0400 From: YU Bo To: davem@davemloft.net, xiyou.wangcong@gmail.com, yuzibode@126.com, tsu.yubo@gmail.com Cc: netdev@vger.kernel.org, janitors@vger.kernel.org Subject: [PATCH V3] net/netlink: make sure the headers line up actual value output Message-ID: <20180504025927.j2imlsr373yt4veo@debian> Mail-Followup-To: davem@davemloft.net, xiyou.wangcong@gmail.com, yuzibode@126.com, netdev@vger.kernel.org, janitors@vger.kernel.org MIME-Version: 1.0 Content-Disposition: inline User-Agent: NeoMutt/20180323-188-b583e9 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Making sure the headers line up properly with the actual value output of the command `cat /proc/net/netlink` Before the patch: sk Eth Pid Groups Rmem Wmem Dump Locks Drops Inode >0000000033203952 0 897 00000113 0 0 0 2 0 14906 Signed-off-by: Bo YU --- Changes in V3: - Drop external website for commit message - Modify the commit accroding to DavidM Changes in V2: - Do not break the code line net/netlink/af_netlink.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -- 2.11.0 diff --git a/net/netlink/af_netlink.c b/net/netlink/af_netlink.c index 55342c4d5cec..2e2dd88fc79f 100644 --- a/net/netlink/af_netlink.c +++ b/net/netlink/af_netlink.c @@ -2606,13 +2606,13 @@ static int netlink_seq_show(struct seq_file *seq, void *v) { if (v == SEQ_START_TOKEN) { seq_puts(seq, - "sk Eth Pid Groups " - "Rmem Wmem Dump Locks Drops Inode\n"); + "sk Eth Pid Groups " + "Rmem Wmem Dump Locks Drops Inode\n"); } else { struct sock *s = v; struct netlink_sock *nlk = nlk_sk(s); - seq_printf(seq, "%pK %-3d %-6u %08x %-8d %-8d %d %-8d %-8d %-8lu\n", + seq_printf(seq, "%pK %-3d %-10u %08x %-8d %-8d %-5d %-8d %-8d %-8lu\n", s, s->sk_protocol, nlk->portid,