---

yaml --- r: 166047 b: refs/heads/master c: 36dd2fd h: refs/heads/master i: 166045: 22ef674 166043: 14a4c26 166039: d23008e 166031: 440518a 166015: e86f36c v: v3
git-mirror · Sep 24, 2009 · 006f8ad · 006f8ad
1 parent 7bacd07
commit 006f8ad
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git 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
@@ -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;