summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlga Kornievskaia <kolga@netapp.com>2019-03-19 12:12:13 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-04-03 06:27:28 +0200
commit0110524398bb210d1f31f3ccd06064be2af858ea (patch)
treee4672654e9925bf4fd73c5843ddec476af328aeb
parente37c15d77d68cf8f4f5af368f431d61372ce2f22 (diff)
downloadtalos-obmc-linux-0110524398bb210d1f31f3ccd06064be2af858ea.tar.gz
talos-obmc-linux-0110524398bb210d1f31f3ccd06064be2af858ea.zip
NFSv4.1 don't free interrupted slot on open
commit 0cb98abb5bd13b9a636bde603d952d722688b428 upstream. Allow the async rpc task for finish and update the open state if needed, then free the slot. Otherwise, the async rpc unable to decode the reply. Signed-off-by: Olga Kornievskaia <kolga@netapp.com> Fixes: ae55e59da0e4 ("pnfs: Don't release the sequence slot...") Cc: stable@vger.kernel.org # v4.18+ Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--fs/nfs/nfs4proc.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
index b422d920104d..44258c516305 100644
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@ -2938,7 +2938,8 @@ static int _nfs4_open_and_get_state(struct nfs4_opendata *opendata,
}
out:
- nfs4_sequence_free_slot(&opendata->o_res.seq_res);
+ if (!opendata->cancelled)
+ nfs4_sequence_free_slot(&opendata->o_res.seq_res);
return ret;
}
OpenPOWER on IntegriCloud