From: Trond Myklebust Date: Thu, 22 Sep 2016 17:39:06 +0000 (-0400) Subject: NFSv4: Ensure we don't re-test revoked and freed stateids X-Git-Tag: Ubuntu-5.10.0-12.13~11673^2~25 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=059b43e9744efe5b6f8e83516d2a0e813bfaee70;p=mirror_ubuntu-hirsute-kernel.git NFSv4: Ensure we don't re-test revoked and freed stateids This fixes a potential infinite loop in nfs_reap_expired_delegations. Signed-off-by: Trond Myklebust Tested-by: Oleg Drokin Signed-off-by: Anna Schumaker --- diff --git a/fs/nfs/delegation.c b/fs/nfs/delegation.c index 0ffead281555..484f14700108 100644 --- a/fs/nfs/delegation.c +++ b/fs/nfs/delegation.c @@ -656,6 +656,7 @@ static void nfs_mark_delegation_revoked(struct nfs_server *server, struct nfs_delegation *delegation) { set_bit(NFS_DELEGATION_REVOKED, &delegation->flags); + delegation->stateid.type = NFS4_INVALID_STATEID_TYPE; nfs_mark_return_delegation(server, delegation); } @@ -894,6 +895,8 @@ static inline bool nfs4_server_rebooted(const struct nfs_client *clp) static void nfs_mark_test_expired_delegation(struct nfs_server *server, struct nfs_delegation *delegation) { + if (delegation->stateid.type == NFS4_INVALID_STATEID_TYPE) + return; clear_bit(NFS_DELEGATION_NEED_RECLAIM, &delegation->flags); set_bit(NFS_DELEGATION_TEST_EXPIRED, &delegation->flags); set_bit(NFS4CLNT_DELEGATION_EXPIRED, &server->nfs_client->cl_state);