NFSv4: Fix the handling of the error NFS4ERR_OLD_STATEID

 Ensure that we retry the failed operation...

 Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>

diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
index 9e492c2261c02809b9ccb9abe7e2bfced26cef3e..54ff465cf7cf3ceaadd39e7fc672c5e0cd7f407d 100644 (file)
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@ -2595,12 +2595,10 @@ int nfs4_handle_exception(const struct nfs_server *server, int errorcode, struct
                case -NFS4ERR_GRACE:
                case -NFS4ERR_DELAY:
                        ret = nfs4_delay(server->client, &exception->timeout);
-                       if (ret == 0)
-                               exception->retry = 1;
-                       break;
+                       if (ret != 0)
+                               break;
                case -NFS4ERR_OLD_STATEID:
-                       if (ret == 0)
-                               exception->retry = 1;
+                       exception->retry = 1;
        }
        /* We failed to handle the error */
        return nfs4_map_errors(ret);