From b0fc29d6fcd0310a8437123fe6f30b1ae60a62f9 Mon Sep 17 00:00:00 2001 From: Trond Myklebust Date: Wed, 16 Jul 2014 10:31:59 -0400 Subject: nfsd: Ensure stateids remain unique until they are freed Add an extra delegation state to allow the stateid to remain in the idr tree until the last reference has been released. This will be necessary to ensure uniqueness once the client_mutex is removed. [jlayton: reset the sc_type under the state_lock in unhash_delegation] Signed-off-by: Trond Myklebust Signed-off-by: Jeff Layton Reviewed-by: Christoph Hellwig Signed-off-by: J. Bruce Fields --- fs/nfsd/state.h | 1 + 1 file changed, 1 insertion(+) (limited to 'fs/nfsd/state.h') diff --git a/fs/nfsd/state.h b/fs/nfsd/state.h index 81b7522e3f67..996d61eeb357 100644 --- a/fs/nfsd/state.h +++ b/fs/nfsd/state.h @@ -80,6 +80,7 @@ struct nfs4_stid { #define NFS4_CLOSED_STID 8 /* For a deleg stateid kept around only to process free_stateid's: */ #define NFS4_REVOKED_DELEG_STID 16 +#define NFS4_CLOSED_DELEG_STID 32 unsigned char sc_type; stateid_t sc_stateid; struct nfs4_client *sc_client; -- cgit v1.2.3