diff options
| author | Sage Weil <sage@newdream.net> | 2011-05-12 15:48:16 -0700 |
|---|---|---|
| committer | Sage Weil <sage@newdream.net> | 2011-05-19 11:25:05 -0700 |
| commit | 9d6fcb081a4770c3772c51c59c7251c22716d7bb (patch) | |
| tree | 8827d90aff9d7f463cb429aff1ecd22dde6a77a6 | |
| parent | 6b4a3b517a767c483d16a200730b2967e0e23b83 (diff) | |
| download | linux-9d6fcb081a4770c3772c51c59c7251c22716d7bb.tar.bz2 | |
ceph: check return value for start_request in writepages
Since we pass the nofail arg, we should never get an error; BUG if we do.
(And fix the function to not return an error if __map_request fails.)
Signed-off-by: Sage Weil <sage@newdream.net>
| -rw-r--r-- | fs/ceph/addr.c | 3 | ||||
| -rw-r--r-- | net/ceph/osd_client.c | 8 |
2 files changed, 9 insertions, 2 deletions
diff --git a/fs/ceph/addr.c b/fs/ceph/addr.c index 54967268a340..33da49dc3cc6 100644 --- a/fs/ceph/addr.c +++ b/fs/ceph/addr.c @@ -848,7 +848,8 @@ get_more_pages: op->payload_len = cpu_to_le32(len); req->r_request->hdr.data_len = cpu_to_le32(len); - ceph_osdc_start_request(&fsc->client->osdc, req, true); + rc = ceph_osdc_start_request(&fsc->client->osdc, req, true); + BUG_ON(rc); req = NULL; /* continue? */ diff --git a/net/ceph/osd_client.c b/net/ceph/osd_client.c index 9adbb01d23ad..caa092eb0009 100644 --- a/net/ceph/osd_client.c +++ b/net/ceph/osd_client.c @@ -1677,8 +1677,14 @@ int ceph_osdc_start_request(struct ceph_osd_client *osdc, */ if (req->r_sent == 0) { rc = __map_request(osdc, req); - if (rc < 0) + if (rc < 0) { + if (nofail) { + dout("osdc_start_request failed map, " + " will retry %lld\n", req->r_tid); + rc = 0; + } goto out_unlock; + } if (req->r_osd == NULL) { dout("send_request %p no up osds in pg\n", req); ceph_monc_request_next_osdmap(&osdc->client->monc); |