On Fri, Jun 09 2017, Steve Dickson wrote:
> When the nfs4 filesystem specified, the default major
> and minor versions should be used.
>
> Signed-off-by: Steve Dickson <steved@xxxxxxxxxx>
> ---
> utils/mount/stropts.c | 16 ++++++++++++----
> 1 file changed, 12 insertions(+), 4 deletions(-)
>
> diff --git a/utils/mount/stropts.c b/utils/mount/stropts.c
> index c0266e5..81fb945 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,8 +323,9 @@ static int nfs_set_version(struct nfsmount_info *mi)
> return 0;
>
> if (strncmp(mi->type, "nfs4", 4) == 0) {
> - mi->version.major = 4;
> - mi->version.v_mode = V_GENERAL;
> + /* Set to default values */
> + mi->version.major = NFS_DEFAULT_MAJOR;
> + mi->version.minor = NFS_DEFAULT_MINOR;
Why do you remove the setting of v_mode to V_GENERAL?
Won't that leave it as V_DEFAULT, and doesn't that mean
that it will negotiate from v4 down to v3??
NeilBrown
> }
> /*
> * Before 2.6.32, the kernel NFS client didn't
> --
> 2.9.4
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-nfs" in
> the body of a message to majordomo@xxxxxxxxxxxxxxx
> More majordomo info at http://vger.kernel.org/majordomo-info.html
Attachment:
signature.asc
Description: PGP signature
