summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authormajianpeng <majianpeng@gmail.com>2013-07-16 15:45:48 +0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-09-26 17:21:58 -0700
commitd0bafacccd5ca14013c4935e8d44dc3c0d3672f7 (patch)
treef5c5881e5cc690162aa08f16abaa78015e921f81 /net
parent1e354b6b4b0cb05d1666c0f8c3a13a164aec70c3 (diff)
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> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net')
-rw-r--r--net/ceph/osd_client.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/net/ceph/osd_client.c b/net/ceph/osd_client.c
index dd47889adc4a..dbc0a7392d67 100644
--- a/net/ceph/osd_client.c
+++ b/net/ceph/osd_client.c
@@ -2129,6 +2129,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;
}