2018-04-10 14:29:55

by Steve Dickson

Subject: [PATCH] mount.nfs: Fix auto protocol negotiation

Commit 71b807e1 introduce a regression that
caused v3 not to be tried when v4 was not
supported by the server during auto negation.

A check of the type in nfs_nfs_version() was
reverted back to only check for the "nfs4"
string not the "nfs" string which fixed the
problem.

Signed-off-by: Steve Dickson <[email protected]>
---
utils/mount/network.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/utils/mount/network.c b/utils/mount/network.c
index 9a2c878..e490399 100644
--- a/utils/mount/network.c
+++ b/utils/mount/network.c
@@ -1279,8 +1279,8 @@ nfs_nfs_version(char *type, struct mount_options *options, struct nfs_version *v
}
}

- if (!found && strncmp(type, "nfs", 3) == 0)
- version_val = "4";
+ if (!found && strcmp(type, "nfs4") == 0)
+ version_val = type + 3;
else if (!found)
return 1;
else if (i <= 2 ) {
--
2.14.3

2018-04-11 14:18:57

by Steve Dickson

Subject: Re: [PATCH] mount.nfs: Fix auto protocol negotiation

On 04/10/2018 10:29 AM, Steve Dickson wrote:
> Commit 71b807e1 introduce a regression that
> caused v3 not to be tried when v4 was not
> supported by the server during auto negation.
>
> A check of the type in nfs_nfs_version() was
> reverted back to only check for the "nfs4"
> string not the "nfs" string which fixed the
> problem.
>
> Signed-off-by: Steve Dickson <[email protected]>
Committed...

steved.

> ---
> utils/mount/network.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/utils/mount/network.c b/utils/mount/network.c
> index 9a2c878..e490399 100644
> --- a/utils/mount/network.c
> +++ b/utils/mount/network.c
> @@ -1279,8 +1279,8 @@ nfs_nfs_version(char *type, struct mount_options *options, struct nfs_version *v
> }
> }
>
> - if (!found && strncmp(type, "nfs", 3) == 0)
> - version_val = "4";
> + if (!found && strcmp(type, "nfs4") == 0)
> + version_val = type + 3;
> else if (!found)
> return 1;
> else if (i <= 2 ) {
>