summaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
Diffstat (limited to 'fs')
-rw-r--r--fs/ceph/osd_client.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/fs/ceph/osd_client.c b/fs/ceph/osd_client.c
index 4a8b4f08d4ae..8e33928647f4 100644
--- a/fs/ceph/osd_client.c
+++ b/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)