Skip to content

Commit a0264d1

Browse files
committed
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
2 parents 5a57b48 + 943d045 commit a0264d1

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

fs/nfs/nfs4proc.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1980,8 +1980,7 @@ _nfs4_opendata_reclaim_to_nfs4_state(struct nfs4_opendata *data)
19801980
if (!data->rpc_done) {
19811981
if (data->rpc_status)
19821982
return ERR_PTR(data->rpc_status);
1983-
/* cached opens have already been processed */
1984-
goto update;
1983+
return nfs4_try_open_cached(data);
19851984
}
19861985

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

19911990
if (data->o_res.delegation_type != 0)
19921991
nfs4_opendata_check_deleg(data, state);
1993-
update:
1992+
19941993
if (!update_open_stateid(state, &data->o_res.stateid,
19951994
NULL, data->o_arg.fmode))
19961995
return ERR_PTR(-EAGAIN);

net/sunrpc/xprtsock.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2158,6 +2158,7 @@ static void xs_tcp_shutdown(struct rpc_xprt *xprt)
21582158
switch (skst) {
21592159
case TCP_FIN_WAIT1:
21602160
case TCP_FIN_WAIT2:
2161+
case TCP_LAST_ACK:
21612162
break;
21622163
case TCP_ESTABLISHED:
21632164
case TCP_CLOSE_WAIT:

0 commit comments

Comments
 (0)