git.ipfire.org Git - thirdparty/kernel/stable-queue.git/blob

   1 From a5e14c9376871ee74fe93fdcb380c5d54eaa2d43 Mon Sep 17 00:00:00 2001
   2 From: Trond Myklebust <trond.myklebust@primarydata.com>
   3 Date: Fri, 17 Feb 2017 19:50:18 -0500
   4 Subject: Revert "NFSv4.1: Handle NFS4ERR_BADSESSION/NFS4ERR_DEADSESSION replies to OP_SEQUENCE"
   5
   6 From: Trond Myklebust <trond.myklebust@primarydata.com>
   7
   8 commit a5e14c9376871ee74fe93fdcb380c5d54eaa2d43 upstream.
   9
  10 This reverts commit 2cf10cdd486c362f983abdce00dc1127e8ab8c59.
  11
  12 The patch has been seen to cause excessive looping.
  13
  14 Reported-by: Olga Kornievskaia <aglo@umich.edu>
  15 Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
  16 Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
  17 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  18
  19 ---
  20  fs/nfs/nfs4proc.c |    4 ----
  21  1 file changed, 4 deletions(-)
  22
  23 --- a/fs/nfs/nfs4proc.c
  24 +++ b/fs/nfs/nfs4proc.c
  25 @@ -815,10 +815,6 @@ static int nfs41_sequence_process(struct
  26         case -NFS4ERR_SEQ_FALSE_RETRY:
  27                 ++slot->seq_nr;
  28                 goto retry_nowait;
  29 -       case -NFS4ERR_DEADSESSION:
  30 -       case -NFS4ERR_BADSESSION:
  31 -               nfs4_schedule_session_recovery(session, res->sr_status);
  32 -               goto retry_nowait;
  33         default:
  34                 /* Just update the slot sequence no. */
  35                 slot->seq_done = 1;