From f08641fa374d0a9cfc9ea05278f336d6d6f03c63 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Sun, 28 Mar 2010 21:22:50 -0700 Subject: [PATCH] --- yaml --- r: 189217 b: refs/heads/master c: 94aa8ae13db2ecf2ec1b4e65a65d3fe92b468e0e h: refs/heads/master i: 189215: 23b758e1e02b372bf3c7e5a8e40584fdacf07b62 v: v3 --- [refs] | 2 +- trunk/fs/ceph/mds_client.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 09c27f94dbf5..bc92d0f1ca71 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 23ab15ad7a9d042afa7303b735b6e24faa607241 +refs/heads/master: 94aa8ae13db2ecf2ec1b4e65a65d3fe92b468e0e diff --git a/trunk/fs/ceph/mds_client.c b/trunk/fs/ceph/mds_client.c index 5268d404963c..5c7920be6420 100644 --- a/trunk/fs/ceph/mds_client.c +++ b/trunk/fs/ceph/mds_client.c @@ -532,7 +532,6 @@ static void __unregister_request(struct ceph_mds_client *mdsc, dout("__unregister_request %p tid %lld\n", req, req->r_tid); rb_erase(&req->r_node, &mdsc->request_tree); RB_CLEAR_NODE(&req->r_node); - ceph_mdsc_put_request(req); if (req->r_unsafe_dir) { struct ceph_inode_info *ci = ceph_inode(req->r_unsafe_dir); @@ -541,6 +540,8 @@ static void __unregister_request(struct ceph_mds_client *mdsc, list_del_init(&req->r_unsafe_dir_item); spin_unlock(&ci->i_unsafe_lock); } + + ceph_mdsc_put_request(req); } /*