Return-Path: linux-nfs-owner@vger.kernel.org Received: from mail-qg0-f54.google.com ([209.85.192.54]:44780 "EHLO mail-qg0-f54.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757959AbaFSOve (ORCPT ); Thu, 19 Jun 2014 10:51:34 -0400 Received: by mail-qg0-f54.google.com with SMTP id q107so2216276qgd.13 for ; Thu, 19 Jun 2014 07:51:33 -0700 (PDT) From: Jeff Layton To: bfields@fieldses.org Cc: linux-nfs@vger.kernel.org Subject: [PATCH v1 025/104] NFSd: Ensure stateids remain unique until they are freed Date: Thu, 19 Jun 2014 10:49:31 -0400 Message-Id: <1403189450-18729-26-git-send-email-jlayton@primarydata.com> In-Reply-To: <1403189450-18729-1-git-send-email-jlayton@primarydata.com> References: <1403189450-18729-1-git-send-email-jlayton@primarydata.com> Sender: linux-nfs-owner@vger.kernel.org List-ID: From: Trond Myklebust Add an extra delegation state to allow the stateid to remain in the idr tree until the last reference has been released. Signed-off-by: Trond Myklebust --- fs/nfsd/nfs4state.c | 7 ++++--- fs/nfsd/state.h | 1 + 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index 7568a05b76f1..6c04b5bb10f7 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c @@ -522,6 +522,7 @@ static void remove_stid(struct nfs4_stid *s) static void nfs4_free_stid(struct kmem_cache *slab, struct nfs4_stid *s) { + remove_stid(s); if (s->sc_file) put_nfs4_file(s->sc_file); kmem_cache_free(slab, s); @@ -592,7 +593,7 @@ unhash_delegation(struct nfs4_delegation *dp) static void destroy_delegation(struct nfs4_delegation *dp) { - remove_stid(&dp->dl_stid); + dp->dl_stid.sc_type = NFS4_CLOSED_DELEG_STID; nfs4_put_delegation(dp); } @@ -605,7 +606,7 @@ static void unhash_and_destroy_delegation(struct nfs4_delegation *dp) static void destroy_revoked_delegation(struct nfs4_delegation *dp) { list_del_init(&dp->dl_recall_lru); - destroy_delegation(dp); + nfs4_put_delegation(dp); } static void revoke_delegation(struct nfs4_delegation *dp) @@ -754,7 +755,6 @@ static void put_generic_stateid(struct nfs4_ol_stateid *stp) { if (!atomic_dec_and_test(&stp->st_stid.sc_count)) return; - remove_stid(&stp->st_stid); nfs4_free_stid(stateid_slab, &stp->st_stid); } @@ -3890,6 +3890,7 @@ static __be32 nfsd4_validate_stateid(struct nfs4_client *cl, stateid_t *stateid) default: printk("unknown stateid type %x\n", s->sc_type); 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 600c24e475d1..78ed70bd666d 100644 --- a/fs/nfsd/state.h +++ b/fs/nfsd/state.h @@ -81,6 +81,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; -- 1.9.3