| Message ID | 1371200017-4860-1-git-send-email-luis.henriques@canonical.com |
|---|---|
| State | New |
| Headers | show |
diff --git a/net/ceph/osd_client.c b/net/ceph/osd_client.c index 79592c4..60ae916 100644 --- a/net/ceph/osd_client.c +++ b/net/ceph/osd_client.c @@ -1358,8 +1358,8 @@ static void kick_requests(struct ceph_osd_client *osdc, int force_resend) dout("kicking lingering %p tid %llu osd%d\n", req, req->r_tid, req->r_osd ? req->r_osd->o_osd : -1); - __unregister_linger_request(osdc, req); __register_request(osdc, req); + __unregister_linger_request(osdc, req); } mutex_unlock(&osdc->request_mutex);
This is a note to let you know that I have just added a patch titled libceph: register request before unregister linger to the linux-3.5.y-queue branch of the 3.5.y.z extended stable tree which can be found at: http://kernel.ubuntu.com/git?p=ubuntu/linux.git;a=shortlog;h=refs/heads/linux-3.5.y-queue If you, or anyone else, feels it should not be added to this tree, please reply to this email. For more information about the 3.5.y.z tree, see https://wiki.ubuntu.com/Kernel/Dev/ExtendedStable Thanks. -Luis ------ From b7feb95b0c808901d9fdc0c48ae6d93e92e436a5 Mon Sep 17 00:00:00 2001 From: Alex Elder <elder@inktank.com> Date: Thu, 6 Dec 2012 07:22:04 -0600 Subject: [PATCH] libceph: register request before unregister linger commit c89ce05e0c5a01a256100ac6a6019f276bdd1ca6 upstream. In kick_requests(), we need to register the request before we unregister the linger request. Otherwise the unregister will reset the request's osd pointer to NULL. Signed-off-by: Alex Elder <elder@inktank.com> Reviewed-by: Sage Weil <sage@inktank.com> Signed-off-by: Luis Henriques <luis.henriques@canonical.com> --- net/ceph/osd_client.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 1.8.1.2