diff --git a/[refs] b/[refs] index 8a503844d227..d1bd884c0a30 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6b0ae4097c1ebad98c7b33f83b4ca7e93890ed12 +refs/heads/master: 234af26ff123dfb2aa48772124721b1354c8e0a5 diff --git a/trunk/net/ceph/osd_client.c b/trunk/net/ceph/osd_client.c index b6776cb627cc..03740e8fc9d1 100644 --- a/trunk/net/ceph/osd_client.c +++ b/trunk/net/ceph/osd_client.c @@ -1672,7 +1672,7 @@ int ceph_osdc_start_request(struct ceph_osd_client *osdc, if (req->r_sent == 0) { rc = __map_request(osdc, req); if (rc < 0) - return rc; + 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); @@ -1689,6 +1689,8 @@ int ceph_osdc_start_request(struct ceph_osd_client *osdc, } } } + +out_unlock: mutex_unlock(&osdc->request_mutex); up_read(&osdc->map_sem); return rc;