Return-Path: Received: from mx1.redhat.com ([209.132.183.28]:56093 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751607AbbGJPty (ORCPT ); Fri, 10 Jul 2015 11:49:54 -0400 Message-ID: <559FE9A1.9020406@RedHat.com> Date: Fri, 10 Jul 2015 11:49:53 -0400 From: Steve Dickson MIME-Version: 1.0 To: Trond Myklebust , Kinglong Mee CC: Linux NFS Mailing list Subject: Re: [PATCH] mount.nfs: Teach mount.nfs about the mountversion option References: <1436193748-4301-1-git-send-email-steved@redhat.com> <559AFF61.9010606@gmail.com> In-Reply-To: Content-Type: text/plain; charset=utf-8 Sender: linux-nfs-owner@vger.kernel.org List-ID: On 07/06/2015 06:29 PM, Trond Myklebust wrote: > On Mon, Jul 6, 2015 at 6:21 PM, Kinglong Mee wrote: >> On 7/6/2015 23:19, Trond Myklebust wrote: >>> On Mon, Jul 6, 2015 at 10:42 AM, Steve Dickson wrote: >>>> When the mountversion option is used, there should >>>> not be any mount negotiations with the server. >>>> >>>> Also, when the option is used, its know that the mount >>>> is a v4 mount and a V_SPECFIC type. >>>> >>>> Signed-off-by: Steve Dickson >>>> --- >>>> utils/mount/network.c | 7 ++++++- >>>> 1 file changed, 6 insertions(+), 1 deletion(-) >>>> >>>> diff --git a/utils/mount/network.c b/utils/mount/network.c >>>> index b5ed850..ebc39d3 100644 >>>> --- a/utils/mount/network.c >>>> +++ b/utils/mount/network.c >>>> @@ -92,6 +92,7 @@ static const char *nfs_version_opttbl[] = { >>>> "v4", >>>> "vers", >>>> "nfsvers", >>>> + "minorversion", >>>> NULL, >>>> }; >>>> >>>> @@ -1272,7 +1273,11 @@ nfs_nfs_version(struct mount_options *options, struct nfs_version *version) >>>> if (!(version->major = strtol(version_val, &cptr, 10))) >>>> goto ret_error; >>>> >>>> - if (version->major < 4) >>>> + if (strcmp(nfs_version_opttbl[i], "minorversion") == 0) { >>>> + version->v_mode = V_SPECIFIC; >>>> + version->minor = version->major; >>>> + version->major = 4; >>>> + } else if (version->major < 4) >>>> version->v_mode = V_SPECIFIC; >>>> >>>> if (*cptr == '.') { >>>> >>> >>> Doesn't this cause a dependency on the ordering of 'nfsvers'/'vers' >>> and 'minorversion' in your mount options string? >> >> Without this patch, there is a dependency on the ordering now. >> mount with "-o minorversion=1", nfs gets strings as "minorversion=1,vers=4.2" >> >> If nfs-utils doesn't parse minorversion, the order dependency also exist. >> >> I agree with parsing minorversion in nfs-utils. >> > > I was rather hoping we could get rid of 'minorversion' soon. It is a > wart, and we've already agreed to deprecate it. I agree with the deprecation, but I think that is a different issue... steved.