Attachment 160100 Details for Bug 249574 – Version 5 patch for this issue

[patch] Version 5 patch for this issue

autofs-5.0.2-fix-nfs-version-in-get-supported-ver-and-cost.patch (text/plain), 1009 bytes, created by Ian Kent on 2007-07-27 08:05:44 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ian Kent

Created: 2007-07-27 08:05:44 UTC

Size: 1009 bytes

patch

obsolete

>diff --git a/modules/replicated.c b/modules/replicated.c
>index de1b40c..0764d4a 100644
>--- a/modules/replicated.c
>+++ b/modules/replicated.c
>@@ -607,12 +607,31 @@ static int get_supported_ver_and_cost(struct host *host, unsigned int version, c
> 
> 	parms.pm_prog = NFS_PROGRAM;
> 
>+	/*
>+	 *  The version passed in is the version as defined in
>+	 *  include/replicated.h.  However, the version we want to send
>+	 *  off to the rpc calls should match the program version of NFS.
>+	 *  So, we do the conversion here.
>+	 */
> 	if (version & UDP_SELECTED_MASK) {
> 		proto = "udp";
>-		vers = (version << 8);
>-	} else {
>+		version >>= 8;
>+	} else
> 		proto = "tcp";
>-		vers = version;
>+
>+	switch (version) {
>+	case NFS2_SUPPORTED:
>+		vers = NFS2_VERSION;
>+		break;
>+	case NFS3_SUPPORTED:
>+		vers = NFS3_VERSION;
>+		break;
>+	case NFS4_SUPPORTED:
>+		vers = NFS4_VERSION;
>+		break;
>+	default:
>+		crit(LOGOPT_ANY, "called with invalid version: 0x%x\n", version);
>+		return 0;
> 	}
> 
> 	rpc_info.proto = getprotobyname(proto);

Actions: View | Diff

Attachments on bug 249574: 159951 | 160100