Commit f25f60be authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents d7757be1 36dd2fdb

fs/nfs/super.c

+2 −0
Original line number Diff line number Diff line
@@ -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;

net/sunrpc/clnt.c

+3 −2
Original line number Diff line number Diff line
@@ -640,7 +640,8 @@ 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)