From f48f700239387f5ae8f1ab389afaa1a05fbbed6b Mon Sep 17 00:00:00 2001
From: Chuck Lever <chuck.lever@oracle.com>
Date: Wed, 29 Aug 2007 17:58:57 -0400
Subject: [PATCH] --- yaml --- r: 64700 b: refs/heads/master c:
 fdb66ff4ace3c4e18809b9b71dfcce1692143147 h: refs/heads/master v: v3

---
 [refs]               | 2 +-
 trunk/fs/nfs/super.c | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 34fcc2d59307..e1d0ab75388b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: deee9369b993b52a8e2f25683b4a67be7a65e8ae
+refs/heads/master: fdb66ff4ace3c4e18809b9b71dfcce1692143147
diff --git a/trunk/fs/nfs/super.c b/trunk/fs/nfs/super.c
index 46139003ea0c..66a223b22a80 100644
--- a/trunk/fs/nfs/super.c
+++ b/trunk/fs/nfs/super.c
@@ -911,13 +911,13 @@ static int nfs_parse_mount_options(char *raw,
 			kfree(string);
 
 			switch (token) {
-			case Opt_udp:
+			case Opt_xprt_udp:
 				mnt->flags &= ~NFS_MOUNT_TCP;
 				mnt->nfs_server.protocol = IPPROTO_UDP;
 				mnt->timeo = 7;
 				mnt->retrans = 5;
 				break;
-			case Opt_tcp:
+			case Opt_xprt_tcp:
 				mnt->flags |= NFS_MOUNT_TCP;
 				mnt->nfs_server.protocol = IPPROTO_TCP;
 				mnt->timeo = 600;
@@ -936,10 +936,10 @@ static int nfs_parse_mount_options(char *raw,
 			kfree(string);
 
 			switch (token) {
-			case Opt_udp:
+			case Opt_xprt_udp:
 				mnt->mount_server.protocol = IPPROTO_UDP;
 				break;
-			case Opt_tcp:
+			case Opt_xprt_tcp:
 				mnt->mount_server.protocol = IPPROTO_TCP;
 				break;
 			default: