Attachment 159874 Details for Bug 239361 – Convert the internal representation of the nfs version number to one accepted by the rpc layer.

[patch] Convert the internal representation of the nfs version number to one accepted by the rpc layer.

autofs-4.1.3-fixup-nfs-version-in-get-supported-ver-and-cost.patch (text/plain), 995 bytes, created by Jeff Moyer on 2007-07-24 18:42:19 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jeff Moyer

Created: 2007-07-24 18:42:19 UTC

Size: 995 bytes

patch

obsolete

>--- autofs-4.1.3/modules/replicated.c.orig	2007-07-24 14:35:49.000000000 -0400
>+++ autofs-4.1.3/modules/replicated.c	2007-07-24 14:35:41.000000000 -0400
>@@ -594,12 +594,32 @@ static int get_supported_ver_and_cost(st
> 
> 	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("%s: called with invalid version: 0x%x\n",
>+		     __FUNCTION__, version);
>+		return 0;
> 	}
> 
> 	rpc_info.proto = getprotobyname(proto);

Actions: View | Diff

Attachments on bug 239361: 159874