From patchwork Fri Jun 12 13:47:19 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kinglong Mee X-Patchwork-Id: 6598841 Return-Path: X-Original-To: patchwork-linux-nfs@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 699109F399 for ; Fri, 12 Jun 2015 13:47:37 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 802E720665 for ; Fri, 12 Jun 2015 13:47:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 78C57205CD for ; Fri, 12 Jun 2015 13:47:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752818AbbFLNre (ORCPT ); Fri, 12 Jun 2015 09:47:34 -0400 Received: from mail-qk0-f178.google.com ([209.85.220.178]:35202 "EHLO mail-qk0-f178.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752220AbbFLNrd (ORCPT ); Fri, 12 Jun 2015 09:47:33 -0400 Received: by qkhq76 with SMTP id q76so17483827qkh.2 for ; Fri, 12 Jun 2015 06:47:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=message-id:date:from:user-agent:mime-version:to:cc:subject :content-type:content-transfer-encoding; bh=l6VFXHgLE+DMIKN/C5Y7Mp9aeP1SiXtWH2I5GgektbA=; b=kj+XQXLP4dJKIS5+4fbYoIkmTCJQIENJxuN8Wf1+X5senGa09s+VlEwUGQVsC9X7v1 QLWAyb+jbmXRideRX3Etq2mJSw3sfAKCsNkasAsoTV4GC36vE7km9H6CqP181yoaxlIM K4IHZI4hWosJCnrwYM224peFTibwMyqF1ceuk1yXcqfsehWZLQZ1kALIXTQefxLU4FTb LxonPNQ++r/89hAf250yYCWooUaSOfVS6hYLWHCBcCtiom86fUM75ZKWRJlKKcGxhFrB xkQCoodXYdMXW7JkogCBtUHv2m8v2JT/lFbBTKvPwL9vxqQFSUxS6jjaLN1S42itKg3b KJQw== X-Received: by 10.140.104.147 with SMTP id a19mr18861336qgf.71.1434116853027; Fri, 12 Jun 2015 06:47:33 -0700 (PDT) Received: from [192.168.99.35] ([104.143.41.79]) by mx.google.com with ESMTPSA id 131sm1674359qhf.14.2015.06.12.06.47.29 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 12 Jun 2015 06:47:32 -0700 (PDT) Message-ID: <557AE2E7.1090908@gmail.com> Date: Fri, 12 Jun 2015 21:47:19 +0800 From: Kinglong Mee User-Agent: Mozilla/5.0 (Windows NT 6.3; WOW64; rv:31.0) Gecko/20100101 Thunderbird/31.7.0 MIME-Version: 1.0 To: Trond Myklebust , "linux-nfs@vger.kernel.org" CC: kinglongmee@gmail.com, David Howells Subject: [PATCH] nfs: Fix showing truncated fsid/dev in /proc/net/nfsfs/volumes Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP A truncated fsid showing from /proc/fs/nfsfs/volumes as, # cat /proc/fs/nfsfs/volumes NV SERVER PORT DEV FSID FSC v4 c0a80881 801 0:43 34931f044c2a439b no It should be as, # cat /proc/fs/nfsfs/volumes NV SERVER PORT DEV FSID FSC v4 c0a80881 801 0:43 34931f044c2a439b:954c5d830fa4be8c no The max buffer length for storing "%llx:%llx" format should be 16 + 1 + 16 + 1 = 34 (16 for %llx, 1 for ':', 1 for '\0'). Also, for storing "%u:%u" of MAJOR() and MINOR() should be 8 + 1 + 3 + 1 = 13 (8 for 2^24, 1 for ':', 3 for 2^8, 1 for '\0'). Signed-off-by: Kinglong Mee --- fs/nfs/client.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/fs/nfs/client.c b/fs/nfs/client.c index 892aeff..873f194 100644 --- a/fs/nfs/client.c +++ b/fs/nfs/client.c @@ -1364,27 +1364,28 @@ static int nfs_volume_list_show(struct seq_file *m, void *v) { struct nfs_server *server; struct nfs_client *clp; - char dev[8], fsid[17]; + char dev[13], fsid[34]; struct nfs_net *nn = net_generic(seq_file_net(m), nfs_net_id); /* display header on line 1 */ if (v == &nn->nfs_volume_list) { - seq_puts(m, "NV SERVER PORT DEV FSID FSC\n"); + seq_puts(m, "NV SERVER PORT DEV FSID" + " FSC\n"); return 0; } /* display one transport per line on subsequent lines */ server = list_entry(v, struct nfs_server, master_link); clp = server->nfs_client; - snprintf(dev, 8, "%u:%u", + snprintf(dev, 13, "%u:%u", MAJOR(server->s_dev), MINOR(server->s_dev)); - snprintf(fsid, 17, "%llx:%llx", + snprintf(fsid, 34, "%llx:%llx", (unsigned long long) server->fsid.major, (unsigned long long) server->fsid.minor); rcu_read_lock(); - seq_printf(m, "v%u %s %s %-7s %-17s %s\n", + seq_printf(m, "v%u %s %s %-12s %-33s %s\n", clp->rpc_ops->version, rpc_peeraddr2str(clp->cl_rpcclient, RPC_DISPLAY_HEX_ADDR), rpc_peeraddr2str(clp->cl_rpcclient, RPC_DISPLAY_HEX_PORT),