aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorDan Carpenter <error27@gmail.com>2011-03-29 06:25:59 +0300
committerSage Weil <sage@newdream.net>2011-03-29 08:59:54 -0700
commit234af26ff123dfb2aa48772124721b1354c8e0a5 (patch)
tree9dfaaeb25a5b1265269796ebc48cab93d64fc1f2 /net
parent6b0ae4097c1ebad98c7b33f83b4ca7e93890ed12 (diff)
downloadkernel_samsung_crespo-234af26ff123dfb2aa48772124721b1354c8e0a5.zip
kernel_samsung_crespo-234af26ff123dfb2aa48772124721b1354c8e0a5.tar.gz
kernel_samsung_crespo-234af26ff123dfb2aa48772124721b1354c8e0a5.tar.bz2
ceph: unlock on error in ceph_osdc_start_request()
There was a missing unlock on the error path if __map_request() failed. Signed-off-by: Dan Carpenter <error27@gmail.com> Signed-off-by: Sage Weil <sage@newdream.net>
Diffstat (limited to 'net')
-rw-r--r--net/ceph/osd_client.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/net/ceph/osd_client.c b/net/ceph/osd_client.c
index b6776cb..03740e8 100644
--- a/net/ceph/osd_client.c
+++ b/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;