From 006f8ad70fbace57eb0cc0a86ffcecd1aceb221a Mon Sep 17 00:00:00 2001
From: Al Viro <viro@ZenIV.linux.org.uk>
Date: Thu, 24 Sep 2009 14:58:42 -0400
Subject: [PATCH] --- yaml --- r: 166047 b: refs/heads/master c:
 36dd2fdb37efdab15844eb72026f8ce3aa0fb560 h: refs/heads/master i:   166045:
 22ef67473287d0f7e1520a1188c8ac3cc59f8134   166043:
 14a4c269e3ca27e816136e889dd34fc13b1e6c26   166039:
 d23008e0842be7a9825f40146ca70231aaf4d71e   166031:
 440518a67c35e7c6497480820eebaf4d4a525082   166015:
 e86f36cb0dc34fbe73789c231a99778af08552d7 v: v3

---
 [refs]               | 2 +-
 trunk/fs/nfs/super.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index d556cc1cf75f..bb0f580e8cb5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7a73fdde3990ea840b604248362876437ea8ce80
+refs/heads/master: 36dd2fdb37efdab15844eb72026f8ce3aa0fb560
diff --git a/trunk/fs/nfs/super.c b/trunk/fs/nfs/super.c
index 810770f96816..29786d3b9326 100644
--- a/trunk/fs/nfs/super.c
+++ b/trunk/fs/nfs/super.c
@@ -1711,6 +1711,8 @@ static int nfs_validate_mount_data(void *options,
 
 		if (!(data->flags & NFS_MOUNT_TCP))
 			args->nfs_server.protocol = XPRT_TRANSPORT_UDP;
+		else
+			args->nfs_server.protocol = XPRT_TRANSPORT_TCP;
 		/* N.B. caller will free nfs_server.hostname in all cases */
 		args->nfs_server.hostname = kstrdup(data->hostname, GFP_KERNEL);
 		args->namlen		= data->namlen;