From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.2 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0D9DBC28CBC for ; Thu, 7 May 2020 01:32:05 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id E24DF20736 for ; Thu, 7 May 2020 01:32:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728299AbgEGBcE (ORCPT ); Wed, 6 May 2020 21:32:04 -0400 Received: from fieldses.org ([173.255.197.46]:48322 "EHLO fieldses.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728294AbgEGBcE (ORCPT ); Wed, 6 May 2020 21:32:04 -0400 Received: by fieldses.org (Postfix, from userid 2815) id AA86B26D5; Wed, 6 May 2020 21:32:03 -0400 (EDT) Date: Wed, 6 May 2020 21:32:03 -0400 To: Kenneth D'souza Cc: linux-nfs@vger.kernel.org, bfields@redhat.com, agaikwad@redhat.com Subject: Re: [PATCH] nfsd4: Make "info" file json compatible. Message-ID: <20200507013203.GD21307@fieldses.org> References: <20200501062230.19693-1-kdsouza@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20200501062230.19693-1-kdsouza@redhat.com> User-Agent: Mutt/1.5.21 (2010-09-15) From: bfields@fieldses.org (J. Bruce Fields) Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org On Fri, May 01, 2020 at 11:52:30AM +0530, Kenneth D'souza wrote: > Currently the output returned by client_info_show() is not > pure json, fix it so user space can pass the file properly. Gah, I said JSON, but the promise was that these files would be YAML, which I believe is a superset of JSON. I'd prefer not to make major backwards-incompatible changes. --b. > > Signed-off-by: Kenneth D'souza > Signed-off-by: Achilles Gaikwad > --- > fs/nfsd/nfs4state.c | 19 ++++++++++++------- > 1 file changed, 12 insertions(+), 7 deletions(-) > > diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c > index c107caa56525..f2a14f95ffa6 100644 > --- a/fs/nfsd/nfs4state.c > +++ b/fs/nfsd/nfs4state.c > @@ -2341,19 +2341,24 @@ static int client_info_show(struct seq_file *m, void *v) > if (!clp) > return -ENXIO; > memcpy(&clid, &clp->cl_clientid, sizeof(clid)); > - seq_printf(m, "clientid: 0x%llx\n", clid); > - seq_printf(m, "address: \"%pISpc\"\n", (struct sockaddr *)&clp->cl_addr); > - seq_printf(m, "name: "); > + seq_printf(m, "{\n"); > + seq_printf(m, "\t\"clientid\": \"0x%llx\",\n", clid); > + seq_printf(m, "\t\"address\": \"%pISpc\",\n", (struct sockaddr *)&clp->cl_addr); > + seq_printf(m, "\t\"name\": "); > seq_quote_mem(m, clp->cl_name.data, clp->cl_name.len); > - seq_printf(m, "\nminor version: %d\n", clp->cl_minorversion); > + seq_printf(m, ", "); > + seq_printf(m, "\n\t\"minor version\": %d,\n", clp->cl_minorversion); > if (clp->cl_nii_domain.data) { > - seq_printf(m, "Implementation domain: "); > + seq_printf(m, "\t\"Implementation domain\": "); > seq_quote_mem(m, clp->cl_nii_domain.data, > clp->cl_nii_domain.len); > - seq_printf(m, "\nImplementation name: "); > + seq_printf(m, ", "); > + seq_printf(m, "\n\t\"Implementation name\": "); > seq_quote_mem(m, clp->cl_nii_name.data, clp->cl_nii_name.len); > - seq_printf(m, "\nImplementation time: [%lld, %ld]\n", > + seq_printf(m, ", "); > + seq_printf(m, "\n\t\"Implementation time\": \"[%lld, %ld]\"\n", > clp->cl_nii_time.tv_sec, clp->cl_nii_time.tv_nsec); > + seq_printf(m, "}\n"); > } > drop_client(clp); > > -- > 2.21.1