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

Merge tag 'nfs-for-5.9-2' of git://git.linux-nfs.org/projects/trondmy/linux-nfs 

Pull NFS client bugfixes from Trond Myklebust:

 - Fix an NFS/RDMA resource leak

 - Fix the error handling during delegation recall

 - NFSv4.0 needs to return the delegation on a zero-stateid SETATTR

 - Stop printk reading past end of string

* tag 'nfs-for-5.9-2' of git://git.linux-nfs.org/projects/trondmy/linux-nfs:
  SUNRPC: stop printk reading past end of string
  NFS: Zero-stateid SETATTR should first return delegation
  NFSv4.1 handle ERR_DELAY error reclaiming locking state on delegation recall
  xprtrdma: Release in-flight MRs on disconnect
parents 34d4ddd3 8c6b6c79

fs/nfs/nfs4proc.c

+9 −2
Original line number Diff line number Diff line
@@ -3293,8 +3293,10 @@ static int _nfs4_do_setattr(struct inode *inode, 


	/* Servers should only apply open mode checks for file size changes */

	truncate = (arg->iap->ia_valid & ATTR_SIZE) ? true : false;

	if (!truncate)

	if (!truncate) {

		nfs4_inode_make_writeable(inode);

		goto zero_stateid;

	}



	if (nfs4_copy_delegation_stateid(inode, FMODE_WRITE, &arg->stateid, &delegation_cred)) {

		/* Use that stateid */
@@ -7298,7 +7300,12 @@ int nfs4_lock_delegation_recall(struct file_lock *fl, struct nfs4_state *state, 
	err = nfs4_set_lock_state(state, fl);

	if (err != 0)

		return err;

	do {

		err = _nfs4_do_setlk(state, F_SETLK, fl, NFS_LOCK_NEW);

		if (err != -NFS4ERR_DELAY)

			break;

		ssleep(1);

	} while (err == -NFS4ERR_DELAY);

	return nfs4_handle_delegation_recall_error(server, state, stateid, fl, err);

}

net/sunrpc/rpcb_clnt.c

+2 −2
Original line number Diff line number Diff line
@@ -982,8 +982,8 @@ static int rpcb_dec_getaddr(struct rpc_rqst *req, struct xdr_stream *xdr, 
	p = xdr_inline_decode(xdr, len);

	if (unlikely(p == NULL))

		goto out_fail;

	dprintk("RPC: %5u RPCB_%s reply: %s\n", req->rq_task->tk_pid,

			req->rq_task->tk_msg.rpc_proc->p_name, (char *)p);

	dprintk("RPC: %5u RPCB_%s reply: %*pE\n", req->rq_task->tk_pid,

			req->rq_task->tk_msg.rpc_proc->p_name, len, (char *)p);



	if (rpc_uaddr2sockaddr(req->rq_xprt->xprt_net, (char *)p, len,

				sap, sizeof(address)) == 0)

net/sunrpc/xprtrdma/verbs.c

+2 −0
Original line number Diff line number Diff line
@@ -933,6 +933,8 @@ static void rpcrdma_req_reset(struct rpcrdma_req *req) 


	rpcrdma_regbuf_dma_unmap(req->rl_sendbuf);

	rpcrdma_regbuf_dma_unmap(req->rl_recvbuf);



	frwr_reset(req);

}



/* ASSUMPTION: the rb_allreqs list is stable for the duration,

CRA Git | Maintained and supported by SUSTech CRA and CCSE