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

Merge tag 'nfs-for-6.3-3' of git://git.linux-nfs.org/projects/anna/linux-nfs 

Pull NFS client fixes from Anna Schumaker:

 - Fix shutdown of NFS TCP client sockets

 - Fix hangs when recovering open state after a server reboot

* tag 'nfs-for-6.3-3' of git://git.linux-nfs.org/projects/anna/linux-nfs:
  SUNRPC: fix shutdown of NFS TCP client socket
  NFSv4: Fix hangs when recovering open state after a server reboot
parents 5a57b48f 943d045a

fs/nfs/nfs4proc.c

+2 −3
Original line number Diff line number Diff line
@@ -1980,8 +1980,7 @@ _nfs4_opendata_reclaim_to_nfs4_state(struct nfs4_opendata *data) 
	if (!data->rpc_done) {

		if (data->rpc_status)

			return ERR_PTR(data->rpc_status);

		/* cached opens have already been processed */

		goto update;

		return nfs4_try_open_cached(data);

	}



	ret = nfs_refresh_inode(inode, &data->f_attr);
@@ -1990,7 +1989,7 @@ _nfs4_opendata_reclaim_to_nfs4_state(struct nfs4_opendata *data) 


	if (data->o_res.delegation_type != 0)

		nfs4_opendata_check_deleg(data, state);

update:



	if (!update_open_stateid(state, &data->o_res.stateid,

				NULL, data->o_arg.fmode))

		return ERR_PTR(-EAGAIN);

net/sunrpc/xprtsock.c

+1 −0
Original line number Diff line number Diff line
@@ -2158,6 +2158,7 @@ static void xs_tcp_shutdown(struct rpc_xprt *xprt) 
	switch (skst) {

	case TCP_FIN_WAIT1:

	case TCP_FIN_WAIT2:

	case TCP_LAST_ACK:

		break;

	case TCP_ESTABLISHED:

	case TCP_CLOSE_WAIT: