Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

Merge tag 'nfs-for-5.2-4' of git://git.linux-nfs.org/projects/anna/linux-nfs 

Pull two more NFS client fixes from Anna Schumaker:
 "These are both stable fixes.

  One to calculate the correct client message length in the case of
  partial transmissions. And the other to set the proper TCP timeout for
  flexfiles"

* tag 'nfs-for-5.2-4' of git://git.linux-nfs.org/projects/anna/linux-nfs:
  NFS/flexfiles: Use the correct TCP timeout for flexfiles I/O
  SUNRPC: Fix up calculation of client message length
parents 43251dbd 68f46159

fs/nfs/flexfilelayout/flexfilelayoutdev.c

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 


#define NFSDBG_FACILITY		NFSDBG_PNFS_LD



static unsigned int dataserver_timeo = NFS_DEF_TCP_RETRANS;

static unsigned int dataserver_timeo = NFS_DEF_TCP_TIMEO;

static unsigned int dataserver_retrans;



static bool ff_layout_has_available_ds(struct pnfs_layout_segment *lseg);

net/sunrpc/xprtsock.c

+8 −8
Original line number Diff line number Diff line
@@ -950,6 +950,8 @@ static int xs_local_send_request(struct rpc_rqst *req) 
	struct sock_xprt *transport =

				container_of(xprt, struct sock_xprt, xprt);

	struct xdr_buf *xdr = &req->rq_snd_buf;

	rpc_fraghdr rm = xs_stream_record_marker(xdr);

	unsigned int msglen = rm ? req->rq_slen + sizeof(rm) : req->rq_slen;

	int status;

	int sent = 0;
@@ -964,9 +966,7 @@ static int xs_local_send_request(struct rpc_rqst *req) 


	req->rq_xtime = ktime_get();

	status = xs_sendpages(transport->sock, NULL, 0, xdr,

			      transport->xmit.offset,

			      xs_stream_record_marker(xdr),

			      &sent);

			      transport->xmit.offset, rm, &sent);

	dprintk("RPC:       %s(%u) = %d\n",

			__func__, xdr->len - transport->xmit.offset, status);
@@ -976,7 +976,7 @@ static int xs_local_send_request(struct rpc_rqst *req) 
	if (likely(sent > 0) || status == 0) {

		transport->xmit.offset += sent;

		req->rq_bytes_sent = transport->xmit.offset;

		if (likely(req->rq_bytes_sent >= req->rq_slen)) {

		if (likely(req->rq_bytes_sent >= msglen)) {

			req->rq_xmit_bytes_sent += transport->xmit.offset;

			transport->xmit.offset = 0;

			return 0;
@@ -1097,6 +1097,8 @@ static int xs_tcp_send_request(struct rpc_rqst *req) 
	struct rpc_xprt *xprt = req->rq_xprt;

	struct sock_xprt *transport = container_of(xprt, struct sock_xprt, xprt);

	struct xdr_buf *xdr = &req->rq_snd_buf;

	rpc_fraghdr rm = xs_stream_record_marker(xdr);

	unsigned int msglen = rm ? req->rq_slen + sizeof(rm) : req->rq_slen;

	bool vm_wait = false;

	int status;

	int sent;
@@ -1122,9 +1124,7 @@ static int xs_tcp_send_request(struct rpc_rqst *req) 
	while (1) {

		sent = 0;

		status = xs_sendpages(transport->sock, NULL, 0, xdr,

				      transport->xmit.offset,

				      xs_stream_record_marker(xdr),

				      &sent);

				      transport->xmit.offset, rm, &sent);



		dprintk("RPC:       xs_tcp_send_request(%u) = %d\n",

				xdr->len - transport->xmit.offset, status);
@@ -1133,7 +1133,7 @@ static int xs_tcp_send_request(struct rpc_rqst *req) 
		 * reset the count of bytes sent. */

		transport->xmit.offset += sent;

		req->rq_bytes_sent = transport->xmit.offset;

		if (likely(req->rq_bytes_sent >= req->rq_slen)) {

		if (likely(req->rq_bytes_sent >= msglen)) {

			req->rq_xmit_bytes_sent += transport->xmit.offset;

			transport->xmit.offset = 0;

			return 0;