From: Al Viro <viro@ZenIV.linux.org.uk>
Date: Thu, 24 Sep 2009 18:58:42 +0000 (-0400)
Subject: nfs[23] tcp breakage in mount with binary options
X-Git-Tag: MMI-PSA29.97-13-9~26323^2
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=36dd2fdb37efdab15844eb72026f8ce3aa0fb560;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

nfs[23] tcp breakage in mount with binary options

We forget to set nfs_server.protocol in tcp case when old-style binary
options are passed to mount.  The thing remains zero and never validated
afterwards.  As the result, we hit BUG in fs/nfs/client.c:588.

Breakage has been introduced in NFS: Add nfs_alloc_parsed_mount_data
merged yesterday...

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
---

diff --git a/fs/nfs/super.c b/fs/nfs/super.c
index 810770f96816..29786d3b9326 100644
--- a/fs/nfs/super.c
+++ b/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;