1 files changed, 7 insertions, 1 deletions

diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
index d181090124db..6bcdecd61125 100644
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@ -370,8 +370,14 @@ int nfs4_handle_exception(struct nfs_server *server, int errorcode, struct nfs4_
                 case -NFS4ERR_DELEG_REVOKED:
                 case -NFS4ERR_ADMIN_REVOKED:
                 case -NFS4ERR_BAD_STATEID:
-                        if (state == NULL)
+                        if (state == NULL) {
+                                if (inode && nfs4_have_delegation(inode,
+                                                FMODE_READ)) {
+                                        nfs4_inode_return_delegation(inode);
+                                        exception->retry = 1;
+                                }
                                 break;
+                        }
                         ret = nfs4_schedule_stateid_recovery(server, state);
                         if (ret < 0)
                                 break;