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 | |
| 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
| -rw-r--r-- | fs/nfs/super.c | 2 | ||||
| -rw-r--r-- | net/sunrpc/clnt.c | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/fs/nfs/super.c b/fs/nfs/super.c index 810770f9681..29786d3b932 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; diff --git a/net/sunrpc/clnt.c b/net/sunrpc/clnt.c index a417d5ab5dd..38829e20500 100644 --- a/net/sunrpc/clnt.c +++ b/net/sunrpc/clnt.c @@ -640,10 +640,11 @@ EXPORT_SYMBOL_GPL(rpc_call_async); /** * rpc_run_bc_task - Allocate a new RPC task for backchannel use, then run * rpc_execute against it - * @ops: RPC call ops + * @req: RPC request + * @tk_ops: RPC call ops */ struct rpc_task *rpc_run_bc_task(struct rpc_rqst *req, - const struct rpc_call_ops *tk_ops) + const struct rpc_call_ops *tk_ops) { struct rpc_task *task; struct xdr_buf *xbufp = &req->rq_snd_buf; |