diff --git a/[refs] b/[refs] index f5885100e98f..c35e716c69e8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 81b024e70fed635a2cf5a4bf911db1649bb005f5 +refs/heads/master: 266673db423e6ab247170d6c6d72ec36e530a911 diff --git a/trunk/fs/ceph/osd_client.c b/trunk/fs/ceph/osd_client.c index 4a8b4f08d4ae..8e33928647f4 100644 --- a/trunk/fs/ceph/osd_client.c +++ b/trunk/fs/ceph/osd_client.c @@ -813,10 +813,13 @@ static void kick_requests(struct ceph_osd_client *osdc, if (req->r_resend) { dout(" r_resend set on tid %llu\n", req->r_tid); + __cancel_request(req); goto kick; } - if (req->r_osd && kickosd == req->r_osd) + if (req->r_osd && kickosd == req->r_osd) { + __cancel_request(req); goto kick; + } err = __map_osds(osdc, req); if (err == 0)