From a220a3cd82e82c681a1bc10953c135cfb825cbc7 Mon Sep 17 00:00:00 2001 From: Alex Elder Date: Fri, 7 Dec 2012 09:57:58 -0600 Subject: [PATCH] --- yaml --- r: 347612 b: refs/heads/master c: 685a7555ca69030739ddb57a47f0ea8ea80196a4 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/ceph/osd_client.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 9d72a39864fd..f1b1f57679fe 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7d5f24812bd182a2471cb69c1c2baf0648332e1f +refs/heads/master: 685a7555ca69030739ddb57a47f0ea8ea80196a4 diff --git a/trunk/net/ceph/osd_client.c b/trunk/net/ceph/osd_client.c index ac7be7202faa..60c74c1f1ea9 100644 --- a/trunk/net/ceph/osd_client.c +++ b/trunk/net/ceph/osd_client.c @@ -581,7 +581,7 @@ static void __kick_osd_requests(struct ceph_osd_client *osdc, dout("__kick_osd_requests osd%d\n", osd->o_osd); err = __reset_osd(osdc, osd); - if (err == -EAGAIN) + if (err) return; list_for_each_entry(req, &osd->o_requests, r_osd_item) { @@ -745,6 +745,7 @@ static int __reset_osd(struct ceph_osd_client *osdc, struct ceph_osd *osd) if (list_empty(&osd->o_requests) && list_empty(&osd->o_linger_requests)) { __remove_osd(osdc, osd); + ret = -ENODEV; } else if (memcmp(&osdc->osdmap->osd_addr[osd->o_osd], &osd->o_con.peer_addr, sizeof(osd->o_con.peer_addr)) == 0 &&