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 <trond.myklebust@primarydata.com>
Signed-off-by: Jeff Layton <jlayton@primarydata.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>

diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
index 1b01a20827ab99e0221cfdc7c807d5d9a02210e2..fd4deb049ddf09809be6fb2761605ab2bbca4bea 100644 (file)
--- a/fs/nfsd/nfs4state.c
+++ b/fs/nfsd/nfs4state.c
@@ -616,6 +616,7 @@ void
 nfs4_put_delegation(struct nfs4_delegation *dp)
 {
        if (atomic_dec_and_test(&dp->dl_count)) {
+               remove_stid(&dp->dl_stid);
                nfs4_free_stid(deleg_slab, &dp->dl_stid);
                num_delegations--;
        }
@@ -657,6 +658,7 @@ unhash_delegation(struct nfs4_delegation *dp)
        struct nfs4_file *fp = dp->dl_file;
 
        spin_lock(&state_lock);
+       dp->dl_stid.sc_type = NFS4_CLOSED_DELEG_STID;
        list_del_init(&dp->dl_perclnt);
        list_del_init(&dp->dl_recall_lru);
        spin_lock(&fp->fi_lock);
@@ -670,19 +672,15 @@ unhash_delegation(struct nfs4_delegation *dp)
        }
 }
 
-
-
 static void destroy_revoked_delegation(struct nfs4_delegation *dp)
 {
        list_del_init(&dp->dl_recall_lru);
-       remove_stid(&dp->dl_stid);
        nfs4_put_delegation(dp);
 }
 
 static void destroy_delegation(struct nfs4_delegation *dp)
 {
        unhash_delegation(dp);
-       remove_stid(&dp->dl_stid);
        nfs4_put_delegation(dp);
 }
 
@@ -4036,7 +4034,9 @@ static __be32 nfsd4_validate_stateid(struct nfs4_client *cl, stateid_t *stateid)
                return nfs_ok;
        default:
                printk("unknown stateid type %x\n", s->sc_type);
+               /* Fallthrough */
        case NFS4_CLOSED_STID:
+       case NFS4_CLOSED_DELEG_STID:
                return nfserr_bad_stateid;
        }
 }

diff --git a/fs/nfsd/state.h b/fs/nfsd/state.h
index 81b7522e3f67411f003baf7e0afc0ce1b0bbf1d2..996d61eeb35754521c2df86db3bea80d9e209838 100644 (file)
--- 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;