diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-24 17:06:16 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-24 17:06:16 -0700 |
| commit | f25f60beea574d7cff65680694a909e58c5c81c1 (patch) | |
| tree | 0fbfa6a66cb67a995e2a98ffcdfa7df63f17c01e /fs/nfs/super.c | |
| parent | d7757be133cc05620608af46acd178686681b7ef (diff) | |
| parent | 36dd2fdb37efdab15844eb72026f8ce3aa0fb560 (diff) | |
Merge branch 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6
* 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6:
nfs[23] tcp breakage in mount with binary options
net: fix htmldocs sunrpc, clnt.c
Diffstat (limited to 'fs/nfs/super.c')
| -rw-r--r-- | fs/nfs/super.c | 2 |
1 files changed, 2 insertions, 0 deletions
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; |