On Mon, Jul 21, 2014 at 11:02:14AM -0400, Jeff Layton wrote: > From: Trond Myklebust <trond.myklebust@xxxxxxxxxxxxxxx> > > When we remove the client_mutex, we'll need to be able to ensure that > these objects aren't destroyed while we're not holding locks. > > Signed-off-by: Trond Myklebust <trond.myklebust@xxxxxxxxxxxxxxx> > --- > fs/nfsd/nfs4state.c | 14 ++++++++------ > 1 file changed, 8 insertions(+), 6 deletions(-) > > diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c > index 3e55df0d7504..76d28be3ef41 100644 > --- a/fs/nfsd/nfs4state.c > +++ b/fs/nfsd/nfs4state.c > @@ -883,8 +883,10 @@ static void close_generic_stateid(struct nfs4_ol_stateid *stp) > release_all_access(stp); > } > > -static void free_generic_stateid(struct nfs4_ol_stateid *stp) > +static void put_generic_stateid(struct nfs4_ol_stateid *stp) Can you please call this put_ol_stateid while you're at it? And throw in a patch to rename the other two generic_stateid names when you touch them or at the end of the series? Otherwise looks good to me, Reviewed-by: Christoph Hellwig <hch@xxxxxx> -- To unsubscribe from this list: send the line "unsubscribe linux-nfs" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html