From patchwork Fri May 4 03:09:23 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bo YU X-Patchwork-Id: 908461 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="c7JCGVtw"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40ccSD3Y5rz9s35 for ; Fri, 4 May 2018 13:09:32 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751279AbeEDDJ3 (ORCPT ); Thu, 3 May 2018 23:09:29 -0400 Received: from mail-pf0-f196.google.com ([209.85.192.196]:34249 "EHLO mail-pf0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751262AbeEDDJ2 (ORCPT ); Thu, 3 May 2018 23:09:28 -0400 Received: by mail-pf0-f196.google.com with SMTP id a14so16337536pfi.1 for ; Thu, 03 May 2018 20:09:28 -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=c7JCGVtwaDukVfAmBusaE8/VyvCDlOIjBuni5moq1GiGQRUwAWH2VVWHYTAuUALm9G gDxrZmGYI1+lCfKC/HAqtmzyDIucLgzwFJvw9EDdPvhLvbECi9GPK4qvBT2AZ/mk7HJ4 qky2UBQbeciTfbTObwWiiCOpLDgCsf8VgOfrAFL3NtW4AEMM6PV4pLetXSPXdZBmqUoy mv/qPBsfvqfmycioZhltcxhgio0obsEYuS/liZpCLBQv50Fl3msDyJll/ZHKE9/jTbBe UtlbCduOM95k1KEVhZiWAGg/9BhbuDU4vvhnN82MZRGh+YJNHqg1mw04i+fwGVPVNrhI q87Q== 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=g7jy/1m9yoh6KeTy7+k6t/3BSed/oa8Buq3a+ZBhraFtOPM2TyHiqYo/Aj5ZuZGuhV fP4aOaTXgCYded3hhnx4g3SFl23q9edVWON/5Wwu+L02a07UglTjAPnQwSi13n28ZLjl 79F+UN2xa3oCyg2HL+e1xb+CfP6pDl7jIGKvuuHe4vbrMazvtD8ZoaxJd/6A6LziH9BK rBEuaSbW+uMIEy+uzUXXgX3z2aCWm8QKudEfaSSeW9UxEvPNy+YI4K4uL1wtJfh4N9gr gYbu2jTD+l71NK7GfwzL6TtQdqjZXZP8GWoTvNK7BkHM43UbPCd5c9534R+ZZbv9J7pa PyeA== X-Gm-Message-State: ALQs6tCpOOC7a/FeaT/fywudX5aCvgvIADagOULrHR9LjjAQY5SwoQK8 mDBiRtQNcwNeVAtmcUadA/b39U3g X-Google-Smtp-Source: AB8JxZpljafUI0/9EY67xqmfCQkMxo6NTC6YZvEkrkI6j2u/MZuiu6bRkTe9s6XXPiM6/dmDhfPA1Q== X-Received: by 2002:a65:40c9:: with SMTP id u9-v6mr8648610pgp.222.1525403367976; Thu, 03 May 2018 20:09:27 -0700 (PDT) Received: from debian ([2001:250:582a:5:a008:5eab:9c8b:bbb0]) by smtp.gmail.com with ESMTPSA id x4sm16548714pfb.99.2018.05.03.20.09.25 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 03 May 2018 20:09:27 -0700 (PDT) Date: Thu, 3 May 2018 23:09:23 -0400 From: YU Bo To: davem@davemloft.net, xiyou.wangcong@gmail.com, tsu.yubo@gmail.com, yuzibode@126.com Cc: netdev@vger.kernel.org Subject: [PATCH V3] net/netlink: make sure the headers line up actual value output Message-ID: <20180504030920.ztpb2axpygrszpvh@debian> Mail-Followup-To: davem@davemloft.net, xiyou.wangcong@gmail.com, yuzibode@126.com, netdev@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,