---

yaml --- r: 373465 b: refs/heads/master c: b155e86 h: refs/heads/master i: 373463: 3a4c30f v: v3
git-mirror · May 2, 2013 · 8ddea7b · 8ddea7b
1 parent 3e3aa0c
commit 8ddea7b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 8 deletions.
diff --git 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
@@ -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;