From patchwork Wed Feb 22 23:35:32 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Trond Myklebust X-Patchwork-Id: 9587553 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 117A7601AE for ; Wed, 22 Feb 2017 23:36:30 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 016FC28631 for ; Wed, 22 Feb 2017 23:36:30 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id EA8E0286D5; Wed, 22 Feb 2017 23:36:29 +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 9657F28631 for ; Wed, 22 Feb 2017 23:36:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933949AbdBVXg2 (ORCPT ); Wed, 22 Feb 2017 18:36:28 -0500 Received: from mail-it0-f66.google.com ([209.85.214.66]:36203 "EHLO mail-it0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932906AbdBVXg1 (ORCPT ); Wed, 22 Feb 2017 18:36:27 -0500 Received: by mail-it0-f66.google.com with SMTP id w185so2811641ita.3 for ; Wed, 22 Feb 2017 15:35:39 -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=MttXY1I4BmRDeXVrNaTONz9BoBVwDrveXUo4mqhCVLk=; b=S/ga0B04WxK8ZZRPl7DHOcB5cwmelcpMZ7dw9Nk9wiq1nMC7G6ra57sBSt3a0zAiTA RdXyKiNPRkz4r5nTNdZf2xe9cEA+EI/fOXrtHmuGurIvYyGznUHx7uzFYaMH1Df9pUcO vmOBani2kY51AKYa25j13ae7VI08SINAon3KpWEA6u5ckN6DhSB0W3FVNHx0gTufv8gX 6xBDwXDNxoBJYSjAOPWyyXn52jVZ/wJNGvPqdCvePPU0x+r+cxHE2n+w5rAPZEMct84X gviUMfmhG+hD4dTC5Y52N1EYrGnRrRkFPrJbyP6oj7K0JBb6X7cVkGh1OZTNYVGvayXK 0AFQ== 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=MttXY1I4BmRDeXVrNaTONz9BoBVwDrveXUo4mqhCVLk=; b=TZclOEYdf8uKurdSanMkkpDr/kYEmjk/00iM3EEnZhlPZMfN03UrAgFgjByDc7/Eez iS4FCVe9+86h5WHxkxEc9JAkUdSwPjCJdAbnc/0LdmQw8fIRjJYm/CG6dcVjCBYtUAM3 G61iB4mczI6AvsBhQhDa9xpE9++D0VV++ES0zticodEsnaTO/Iu3rBjfUkvMZZUAwFoO 27cFU9oJlQ9siJKOr3nrhtLLYX4fcFh5h8SH9YpieUHQZFz4VtstnRHmlTd1JBarVCRV 4Lk9Xm62zLuvv9ZB1jh/tlXsPJEr3VLpL/HYc/4smQ9VvgCa+kTa/GuEr6ekV1QY/t6c J0sg== X-Gm-Message-State: AMke39mJaCnIeBTEyjoyf8Sx4dOIUai49MxnwWgesiGTp8MoyuQHabHRKAHx8rgC6LJYBw== X-Received: by 10.36.65.4 with SMTP id x4mr1124487ita.69.1487806538548; Wed, 22 Feb 2017 15:35:38 -0800 (PST) Received: from localhost.localdomain ([50.124.63.84]) by smtp.gmail.com with ESMTPSA id 12sm1135567itl.31.2017.02.22.15.35.37 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 22 Feb 2017 15:35:38 -0800 (PST) From: Trond Myklebust To: bfields@fieldses.org, neilb@suse.com Cc: linux-nfs@vger.kernel.org Subject: [PATCH v2 1/2] nfsd: Allow enabling NFSv4.x without also requiring NFSv4.0 Date: Wed, 22 Feb 2017 18:35:32 -0500 Message-Id: <20170222233533.23845-2-trond.myklebust@primarydata.com> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20170222233533.23845-1-trond.myklebust@primarydata.com> References: <20170222233533.23845-1-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 For some setups, we may want to allow clients to fall back to NFSv3, or even to fail, if a specific minor version of NFSv4 is not enabled. For instance, an application that relies on NFSv4.2 CLONE functionality is simply not going to work when it falls back to NFSv4.1 or NFSv4. Signed-off-by: Trond Myklebust --- fs/nfsd/nfsctl.c | 16 ++++++++-------- fs/nfsd/nfssvc.c | 14 ++++++++++++++ 2 files changed, 22 insertions(+), 8 deletions(-) diff --git a/fs/nfsd/nfsctl.c b/fs/nfsd/nfsctl.c index d54fb0e3f30e..4bbba88416dc 100644 --- a/fs/nfsd/nfsctl.c +++ b/fs/nfsd/nfsctl.c @@ -561,6 +561,7 @@ static ssize_t __write_versions(struct file *file, char *buf, size_t size) len = qword_get(&mesg, vers, size); if (len <= 0) return -EINVAL; do { + enum vers_op cmd; sign = *vers; if (sign == '+' || sign == '-') num = simple_strtol((vers+1), &minorp, 0); @@ -571,21 +572,20 @@ static ssize_t __write_versions(struct file *file, char *buf, size_t size) return -EINVAL; if (kstrtouint(minorp+1, 0, &minor) < 0) return -EINVAL; - if (nfsd_minorversion(minor, sign == '-' ? - NFSD_CLEAR : NFSD_SET) < 0) - return -EINVAL; - goto next; - } + } else + minor = 0; + cmd = sign == '-' ? NFSD_CLEAR : NFSD_SET; switch(num) { case 2: case 3: - case 4: - nfsd_vers(num, sign == '-' ? NFSD_CLEAR : NFSD_SET); + nfsd_vers(num, cmd); break; + case 4: + if (nfsd_minorversion(minor, cmd) >= 0) + break; default: return -EINVAL; } - next: vers += len + 1; } while ((len = qword_get(&mesg, vers, size)) > 0); /* If all get turned off, turn them back on, as diff --git a/fs/nfsd/nfssvc.c b/fs/nfsd/nfssvc.c index e6bfd96734c0..07bf3bd9687b 100644 --- a/fs/nfsd/nfssvc.c +++ b/fs/nfsd/nfssvc.c @@ -153,6 +153,18 @@ int nfsd_vers(int vers, enum vers_op change) return 0; } +static void +nfsd_adjust_nfsd_versions4(void) +{ + unsigned i; + + for (i = 0; i <= NFSD_SUPPORTED_MINOR_VERSION; i++) { + if (nfsd_supported_minorversions[i]) + return; + } + nfsd_vers(4, NFSD_CLEAR); +} + int nfsd_minorversion(u32 minorversion, enum vers_op change) { if (minorversion > NFSD_SUPPORTED_MINOR_VERSION) @@ -160,9 +172,11 @@ int nfsd_minorversion(u32 minorversion, enum vers_op change) switch(change) { case NFSD_SET: nfsd_supported_minorversions[minorversion] = true; + nfsd_vers(4, NFSD_SET); break; case NFSD_CLEAR: nfsd_supported_minorversions[minorversion] = false; + nfsd_adjust_nfsd_versions4(); break; case NFSD_TEST: return nfsd_supported_minorversions[minorversion];