summaryrefslogtreecommitdiffstats
path: root/fs/nfsd/nfs4callback.c
diff options
context:
space:
mode:
authorTrond Myklebust <trond.myklebust@primarydata.com>2014-07-29 21:34:06 -0400
committerJ. Bruce Fields <bfields@redhat.com>2014-07-31 12:43:53 -0400
commit6011695da2d7c588f2dfe57c318758f0bf1154dd (patch)
tree30c9d21250bb486ce5f300ada41711c44d5c29a9 /fs/nfsd/nfs4callback.c
parentb3fbfe0e7a1d88e3cbaa282c5f6fc50e8c67448c (diff)
downloadblackbird-op-linux-6011695da2d7c588f2dfe57c318758f0bf1154dd.tar.gz
blackbird-op-linux-6011695da2d7c588f2dfe57c318758f0bf1154dd.zip
nfsd: Add reference counting to the lock and open stateids
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. Add a ->free() callback to the struct nfs4_stid, so that we can release a reference to the stid without caring about the contents. Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com> Reviewed-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Jeff Layton <jlayton@primarydata.com> Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Diffstat (limited to 'fs/nfsd/nfs4callback.c')
-rw-r--r--fs/nfsd/nfs4callback.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/nfsd/nfs4callback.c b/fs/nfsd/nfs4callback.c
index e9813389687b..8574c708cf8c 100644
--- a/fs/nfsd/nfs4callback.c
+++ b/fs/nfsd/nfs4callback.c
@@ -905,7 +905,7 @@ static void nfsd4_cb_recall_release(void *calldata)
spin_lock(&clp->cl_lock);
list_del(&cb->cb_per_client);
spin_unlock(&clp->cl_lock);
- nfs4_put_delegation(dp);
+ nfs4_put_stid(&dp->dl_stid);
}
}
OpenPOWER on IntegriCloud