From patchwork Wed Feb 22 23:35:33 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Trond Myklebust X-Patchwork-Id: 9587557 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 6342E601AE for ; Wed, 22 Feb 2017 23:36:34 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 52EC128631 for ; Wed, 22 Feb 2017 23:36:34 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 480AD286D5; Wed, 22 Feb 2017 23:36:34 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.3 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id ED13A28631 for ; Wed, 22 Feb 2017 23:36:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934321AbdBVXgb (ORCPT ); Wed, 22 Feb 2017 18:36:31 -0500 Received: from mail-it0-f66.google.com ([209.85.214.66]:36209 "EHLO mail-it0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933767AbdBVXg1 (ORCPT ); Wed, 22 Feb 2017 18:36:27 -0500 Received: by mail-it0-f66.google.com with SMTP id w185so2811689ita.3 for ; Wed, 22 Feb 2017 15:35:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=mc/nLfkzh+jFNu0Aig1oBAYVIFjywtHzFRYbvjB4n+E=; b=NM03B10BXozLAv5uRSzdPwLyqw6s+BhX2cSHyenPIythSRrZdl2jxZysmY96dcFF7L EMqCH8SQ94DhP5eNRH5Jy8jfp1CZqY5dZ6PRr/QSS2RJGr55HFcvwNzUKIHH9f6Z4RC6 q9nX6+hLHKa3pM/sZY4Dw0hwnc7R5/1QQS0FZMhObzwpuitC9XVFqN5j6QhzqjqaxomO EjMB7eRdoYIfR0JTbuZaKY5EVuhzwgH8J0H2LkX1xYvKBSWpmkiQgg9vYmH1/eV1jfYE lqr5wfCt4pOLXjh/IoMpyTz+GiJtt23ZEYNyIw0dzaLi51Vzt8TYvYX0NCezlERjRJZi ppHA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=mc/nLfkzh+jFNu0Aig1oBAYVIFjywtHzFRYbvjB4n+E=; b=Cdsb/2w/kyyJLhI0mkeNR/8g0EzZal93XX8nNW5S4dvDg+R5R6Fkw2IWRgnYkA9a+h GOD6i8eUTUdpbvTw8xE15D82wt2W3Evx3aD76+QSj6aqcjHwP6gradiLquuyWf7qiF4n aVxgD+aUmGEqE++DvkdKBBfOX9Nc7sw/mfLYiZDhTmeRVxNADoI1mikAKSNPkX7lZk1v 3RaMTkZkRVqUb+taRMAfxJZ9Sg2dpi1Hf8H878Ucw4R+1TNOGeIqZJ11pGSzc/aVqZoz 76yDKfsFDvqQNAS+sHhzWY8wMkexG6m6R4OjwLDSm9Cv0Fkev27nXCVwM4JKeUiMMITD RgJA== X-Gm-Message-State: AMke39mGA7SXJUBqaWl61TCIo30UZTXh6sxhPImye02bvoU3BdVqrQ1kMhT447X4hmYsOQ== X-Received: by 10.107.167.204 with SMTP id q195mr29949677ioe.170.1487806539742; Wed, 22 Feb 2017 15:35:39 -0800 (PST) Received: from localhost.localdomain ([50.124.63.84]) by smtp.gmail.com with ESMTPSA id 12sm1135567itl.31.2017.02.22.15.35.38 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 22 Feb 2017 15:35:39 -0800 (PST) From: Trond Myklebust To: bfields@fieldses.org, neilb@suse.com Cc: linux-nfs@vger.kernel.org Subject: [PATCH v2 2/2] nfsd: Fix display of the version string Date: Wed, 22 Feb 2017 18:35:33 -0500 Message-Id: <20170222233533.23845-3-trond.myklebust@primarydata.com> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20170222233533.23845-2-trond.myklebust@primarydata.com> References: <20170222233533.23845-1-trond.myklebust@primarydata.com> <20170222233533.23845-2-trond.myklebust@primarydata.com> Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The current display code assumes that v4 minor version 0 is tracked by the call to nfsd_vers(). Now it is tracked by nfsd_minorversion(), and so we need to adjust the display code. Signed-off-by: Trond Myklebust --- fs/nfsd/nfsctl.c | 56 ++++++++++++++++++++++++++------------------------------ 1 file changed, 26 insertions(+), 30 deletions(-) diff --git a/fs/nfsd/nfsctl.c b/fs/nfsd/nfsctl.c index 4bbba88416dc..73e75ac90525 100644 --- a/fs/nfsd/nfsctl.c +++ b/fs/nfsd/nfsctl.c @@ -536,6 +536,19 @@ static ssize_t write_pool_threads(struct file *file, char *buf, size_t size) return rv; } +static ssize_t +nfsd_print_version_support(char *buf, int remaining, const char *sep, + unsigned vers, unsigned minor) +{ + const char *format = (minor == 0) ? "%s%c%u" : "%s%c%u.%u"; + bool supported = !!nfsd_vers(vers, NFSD_TEST); + + if (vers == 4 && !nfsd_minorversion(minor, NFSD_TEST)) + supported = false; + return snprintf(buf, remaining, format, sep, + supported ? '+' : '-', vers, minor); +} + static ssize_t __write_versions(struct file *file, char *buf, size_t size) { char *mesg = buf; @@ -598,40 +611,23 @@ static ssize_t __write_versions(struct file *file, char *buf, size_t size) len = 0; sep = ""; remaining = SIMPLE_TRANSACTION_LIMIT; - for (num=2 ; num <= 4 ; num++) - if (nfsd_vers(num, NFSD_AVAIL)) { - len = snprintf(buf, remaining, "%s%c%d", sep, - nfsd_vers(num, NFSD_TEST)?'+':'-', - num); - sep = " "; - - if (len >= remaining) - break; - remaining -= len; - buf += len; - tlen += len; - } - if (nfsd_vers(4, NFSD_AVAIL)) - for (minor = 0; minor <= NFSD_SUPPORTED_MINOR_VERSION; - minor++) { - if (minor == 0 && nfsd_minorversion(minor, NFSD_TEST)) - /* for backward compatibility, don't report - * +4.0 - */ - continue; - len = snprintf(buf, remaining, " %c4.%u", - (nfsd_vers(4, NFSD_TEST) && - nfsd_minorversion(minor, NFSD_TEST)) ? - '+' : '-', - minor); - + for (num=2 ; num <= 4 ; num++) { + if (!nfsd_vers(num, NFSD_AVAIL)) + continue; + minor = 0; + do { + len = nfsd_print_version_support(buf, remaining, + sep, num, minor); if (len >= remaining) - break; + goto out; remaining -= len; buf += len; tlen += len; - } - + minor++; + sep = " "; + } while (num == 4 && minor <= NFSD_SUPPORTED_MINOR_VERSION); + } +out: len = snprintf(buf, remaining, "\n"); if (len >= remaining) return -EINVAL;