openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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
This commit is contained in:
Linus Torvalds 2009-09-24 17:06:16 -07:00
parent d7757be133 36dd2fdb37
commit f25f60beea
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fs/nfs/super.c
View File

@ -1711,6 +1711,8 @@ static int nfs_validate_mount_data(void *options,
if (!(data->flags & NFS_MOUNT_TCP)) if (!(data->flags & NFS_MOUNT_TCP))
args->nfs_server.protocol = XPRT_TRANSPORT_UDP; 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 */ /* N.B. caller will free nfs_server.hostname in all cases */
args->nfs_server.hostname = kstrdup(data->hostname, GFP_KERNEL); args->nfs_server.hostname = kstrdup(data->hostname, GFP_KERNEL);
args->namlen = data->namlen; args->namlen = data->namlen;

5
net/sunrpc/clnt.c
View File

@ -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_run_bc_task - Allocate a new RPC task for backchannel use, then run
* rpc_execute against it * 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, 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 rpc_task *task;
struct xdr_buf *xbufp = &req->rq_snd_buf; struct xdr_buf *xbufp = &req->rq_snd_buf;