From: Steve Dickson <SteveD@RedHat.com>
To: Linux NFS Mailing list <linux-nfs@vger.kernel.org>
Subject: Re: [PATCH 1/2 V3] mount.nfs: Use default minor version when -t nfs4 is specified
Date: Wed, 21 Jun 2017 12:18:37 -0400 [thread overview]
Message-ID: <ce6cfda2-df5c-af6c-277c-abce3ea60329@RedHat.com> (raw)
In-Reply-To: <20170619152526.26260-1-steved@redhat.com>
On 06/19/2017 11:25 AM, Steve Dickson wrote:
> When the nfs4 filesystem specified, the default major
> and minor versions should be used.
>
> v2: Added the NFS_DEFAULT_MAJOR/MINOR defines
> v3: Add back the setting of v_mode to V_GENERAL in nfs_set_version()
>
> Signed-off-by: Steve Dickson <steved@redhat.com>
Committed...
steved.
> ---
> utils/mount/stropts.c | 15 ++++++++++++---
> 1 file changed, 12 insertions(+), 3 deletions(-)
>
> diff --git a/utils/mount/stropts.c b/utils/mount/stropts.c
> index c0266e5..fbea6fb 100644
> --- a/utils/mount/stropts.c
> +++ b/utils/mount/stropts.c
> @@ -73,6 +73,13 @@
> #define NFS_DEF_BG_TIMEOUT_MINUTES (10000u)
> #endif
>
> +#ifndef NFS_DEFAULT_MAJOR
> +#define NFS_DEFAULT_MAJOR 4
> +#endif
> +#ifndef NFS_DEFAULT_MINOR
> +#define NFS_DEFAULT_MINOR 2
> +#endif
> +
> extern int nfs_mount_data_version;
> extern char *progname;
> extern int verbose;
> @@ -124,8 +131,8 @@ static void nfs_default_version(struct nfsmount_info *mi)
> }
>
> #endif /* MOUNT_CONFIG */
> - mi->version.major = 4;
> - mi->version.minor = 2;
> + mi->version.major = NFS_DEFAULT_MAJOR;
> + mi->version.minor = NFS_DEFAULT_MINOR;
> }
>
> /*
> @@ -316,7 +323,9 @@ static int nfs_set_version(struct nfsmount_info *mi)
> return 0;
>
> if (strncmp(mi->type, "nfs4", 4) == 0) {
> - mi->version.major = 4;
> + /* Set to default values */
> + mi->version.major = NFS_DEFAULT_MAJOR;
> + mi->version.minor = NFS_DEFAULT_MINOR;
> mi->version.v_mode = V_GENERAL;
> }
> /*
>
next prev parent reply other threads:[~2017-06-21 16:28 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-06-19 15:25 [PATCH 1/2 V3] mount.nfs: Use default minor version when -t nfs4 is specified Steve Dickson
2017-06-19 15:25 ` [PATCH 2/2 V4] mount.nfs: Use default minor version when -o v4 " Steve Dickson
2017-06-21 16:19 ` Steve Dickson
2017-06-21 16:18 ` Steve Dickson [this message]
-- strict thread matches above, loose matches on Subject: below --
2017-06-19 15:10 [PATCH 1/2 V3] mount.nfs: Use default minor version when -t nfs4 " Steve Dickson
2017-06-13 17:31 Steve Dickson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=ce6cfda2-df5c-af6c-277c-abce3ea60329@RedHat.com \
--to=steved@redhat.com \
--cc=linux-nfs@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.