| Message ID | 1379705666-15586-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 f181972..a90c575 100644 --- a/net/ceph/osd_client.c +++ b/net/ceph/osd_client.c @@ -1745,6 +1745,8 @@ int ceph_osdc_start_request(struct ceph_osd_client *osdc, dout("osdc_start_request failed map, " " will retry %lld\n", req->r_tid); rc = 0; + } else { + __unregister_request(osdc, req); } goto out_unlock; }
This is a note to let you know that I have just added a patch titled libceph: unregister request in __map_request failed and 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 b06300bc1ba0152d4978a6ce55f3723d5a56f5da Mon Sep 17 00:00:00 2001 From: majianpeng <majianpeng@gmail.com> Date: Tue, 16 Jul 2013 15:45:48 +0800 Subject: [PATCH] libceph: unregister request in __map_request failed and nofail == false commit 73d9f7eef3d98c3920e144797cc1894c6b005a1e upstream. For nofail == false request, if __map_request failed, the caller does cleanup work, like releasing the relative pages. It doesn't make any sense to retry this request. Signed-off-by: Jianpeng Ma <majianpeng@gmail.com> Reviewed-by: Sage Weil <sage@inktank.com> [ luis: backported to 3.5: adjusted context ] Signed-off-by: Luis Henriques <luis.henriques@canonical.com> --- net/ceph/osd_client.c | 2 ++ 1 file changed, 2 insertions(+) -- 1.8.3.2