From b029e9bda67b0a9edb23b1886296475127419371 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Fri, 21 May 2010 12:31:49 -0700 Subject: [PATCH] --- yaml --- r: 198094 b: refs/heads/master c: 970690012c572fc3b7be532080564b730f6a9c02 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/ceph/mon_client.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 44630f27bdfc..0473d8ff375c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9e32789f63fc5ad91c8b10f68ec23a86856d5af5 +refs/heads/master: 970690012c572fc3b7be532080564b730f6a9c02 diff --git a/trunk/fs/ceph/mon_client.c b/trunk/fs/ceph/mon_client.c index 478729a6ffce..12d94f24ee97 100644 --- a/trunk/fs/ceph/mon_client.c +++ b/trunk/fs/ceph/mon_client.c @@ -104,6 +104,7 @@ static void __send_prepared_auth_request(struct ceph_mon_client *monc, int len) monc->pending_auth = 1; monc->m_auth->front.iov_len = len; monc->m_auth->hdr.front_len = cpu_to_le32(len); + ceph_con_revoke(monc->con, monc->m_auth); ceph_msg_get(monc->m_auth); /* keep our ref */ ceph_con_send(monc->con, monc->m_auth); } @@ -539,6 +540,7 @@ static void __resend_generic_request(struct ceph_mon_client *monc) for (p = rb_first(&monc->generic_request_tree); p; p = rb_next(p)) { req = rb_entry(p, struct ceph_mon_generic_request, node); + ceph_con_revoke(monc->con, req->request); ceph_con_send(monc->con, ceph_msg_get(req->request)); } }