diff options
| author | Sage Weil <sage@newdream.net> | 2009-10-09 10:31:32 -0700 |
|---|---|---|
| committer | Sage Weil <sage@newdream.net> | 2009-10-09 11:58:20 -0700 |
| commit | 266673db423e6ab247170d6c6d72ec36e530a911 (patch) | |
| tree | d86b9d3b3e34fbf2dcc64b21d73145fd962237ac | |
| parent | 81b024e70fed635a2cf5a4bf911db1649bb005f5 (diff) | |
| download | kernel_samsung_tuna-266673db423e6ab247170d6c6d72ec36e530a911.zip kernel_samsung_tuna-266673db423e6ab247170d6c6d72ec36e530a911.tar.gz kernel_samsung_tuna-266673db423e6ab247170d6c6d72ec36e530a911.tar.bz2 | |
ceph: cancel osd requests before resending them
This ensures we don't submit the same request twice if we are kicking a
specific osd (as with an osd_reset), or when we hit a transient error and
resend.
Signed-off-by: Sage Weil <sage@newdream.net>
| -rw-r--r-- | fs/ceph/osd_client.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/fs/ceph/osd_client.c b/fs/ceph/osd_client.c index 4a8b4f0..8e33928 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) |