Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id E2FBEC433F5 for ; Mon, 29 Nov 2021 19:29:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230213AbhK2Tcz (ORCPT ); Mon, 29 Nov 2021 14:32:55 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:52441 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238478AbhK2Tay (ORCPT ); Mon, 29 Nov 2021 14:30:54 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1638214055; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=9bIx0Q3iBNKWJj2cLrtduTOqXLir4GsCceMH1L6xJFY=; b=iGQDIng4oyaxn17QKkdh3Aw/FYl4hJGcYKNrB+F9uHwm3ZaXMFXMNwLBC30DgIyWskmveE gMbnxI+WmEFDZf6cghjd6PDeF2QiqN1+JKAoKonNU8f0ENB8V7IvvhR3Ofw59ZvfiGiuHw uU1PuHyn+VE0TNlVHEGTW6txrkgi5vY= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-242-dv1IHqT7Nai0qrDZaf9HZQ-1; Mon, 29 Nov 2021 14:27:34 -0500 X-MC-Unique: dv1IHqT7Nai0qrDZaf9HZQ-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 362E269737 for ; Mon, 29 Nov 2021 19:27:33 +0000 (UTC) Received: from dobby.home.dicksonnet.net (ovpn-112-138.phx2.redhat.com [10.3.112.138]) by smtp.corp.redhat.com (Postfix) with ESMTP id D853679452 for ; Mon, 29 Nov 2021 19:27:32 +0000 (UTC) From: Steve Dickson To: Linux NFS Mailing list Subject: [PATCH RFC 1/3] nfsd: Remove the ability to enable NFS v2. Date: Mon, 29 Nov 2021 14:27:29 -0500 Message-Id: <20211129192731.783466-2-steved@redhat.com> In-Reply-To: <20211129192731.783466-1-steved@redhat.com> References: <20211129192731.783466-1-steved@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org Signed-off-by: Steve Dickson --- nfs.conf | 1 - utils/nfsd/nfsd.c | 2 -- utils/nfsd/nfsd.man | 4 ++-- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/nfs.conf b/nfs.conf index 8c714ff7..21d3e7b2 100644 --- a/nfs.conf +++ b/nfs.conf @@ -68,7 +68,6 @@ # lease-time=90 # udp=n # tcp=y -# vers2=n # vers3=y # vers4=y # vers4.0=y diff --git a/utils/nfsd/nfsd.c b/utils/nfsd/nfsd.c index b0741718..4016a761 100644 --- a/utils/nfsd/nfsd.c +++ b/utils/nfsd/nfsd.c @@ -226,7 +226,6 @@ main(int argc, char **argv) } /* FALLTHRU */ case 3: - case 2: NFSCTL_VERUNSET(versbits, c); break; default: @@ -251,7 +250,6 @@ main(int argc, char **argv) minorvers = minorversset = minormask; /* FALLTHRU */ case 3: - case 2: NFSCTL_VERSET(versbits, c); break; default: diff --git a/utils/nfsd/nfsd.man b/utils/nfsd/nfsd.man index 2701ba78..716f538b 100644 --- a/utils/nfsd/nfsd.man +++ b/utils/nfsd/nfsd.man @@ -57,7 +57,7 @@ This option can be used to request that .B rpc.nfsd does not offer certain versions of NFS. The current version of .B rpc.nfsd -can support major NFS versions 2,3,4 and the minor versions 4.0, 4.1 and 4.2. +can support major NFS versions 3,4 and the minor versions 4.0, 4.1 and 4.2. .TP .B \-s " or " \-\-syslog By default, @@ -84,7 +84,7 @@ This option can be used to request that .B rpc.nfsd offer certain versions of NFS. The current version of .B rpc.nfsd -can support major NFS versions 2,3,4 and the minor versions 4.0, 4.1 and 4.2. +can support major NFS versions 3,4 and the minor versions 4.0, 4.1 and 4.2. .TP .B \-L " or " \-\-lease-time seconds Set the lease-time used for NFSv4. This corresponds to how often -- 2.31.1