From 8ddea7ba11a9b9fd4add3749e37992f054bb02b0 Mon Sep 17 00:00:00 2001 From: Alex Elder Date: Mon, 15 Apr 2013 14:50:37 -0500 Subject: [PATCH] --- yaml --- r: 373465 b: refs/heads/master c: b155e86cf619886388d80ec298b0f13694c83595 h: refs/heads/master i: 373463: 3a4c30f67bd4e413dccb8b46dae712b97abed689 v: v3 --- [refs] | 2 +- trunk/drivers/block/rbd.c | 8 +------- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index ea777fcb0fb4..8120b5ee53df 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 49719778bfa5371ec9b5a7d989bb29000e3ac5df +refs/heads/master: b155e86cf619886388d80ec298b0f13694c83595 diff --git a/trunk/drivers/block/rbd.c b/trunk/drivers/block/rbd.c index 8e8b876e83c3..81751cd8361e 100644 --- a/trunk/drivers/block/rbd.c +++ b/trunk/drivers/block/rbd.c @@ -1167,7 +1167,7 @@ static inline void rbd_img_obj_request_add(struct rbd_img_request *img_request, { rbd_assert(obj_request->img_request == NULL); - rbd_obj_request_get(obj_request); + /* Image request now owns object's original reference */ obj_request->img_request = img_request; obj_request->which = img_request->obj_request_count; rbd_assert(!obj_request_img_data_test(obj_request)); @@ -1815,12 +1815,6 @@ static int rbd_img_request_submit(struct rbd_img_request *img_request) ret = rbd_obj_request_submit(osdc, obj_request); if (ret) return ret; - /* - * The image request has its own reference to each - * of its object requests, so we can safely drop the - * initial one here. - */ - rbd_obj_request_put(obj_request); } return 0;