浏览代码

rbd: adjust image object request ref counting

An extra reference is taken when an object request is added as one
of the requests making up an image object.  A reference is dropped
again when the image's object requests get submitted.

The original reference for the object request will remain throughout
this period, so we don't need to add and then take away an extra
one.

This can be interpreted as the image request inheriting the original
object request's reference.

Signed-off-by: Alex Elder <elder@inktank.com>
Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
Alex Elder 12 年之前
父节点
当前提交
b155e86cf6
共有 1 个文件被更改,包括 1 次插入7 次删除
  1. 1 7
      drivers/block/rbd.c

+ 1 - 7
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_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->img_request = img_request;
 	obj_request->which = img_request->obj_request_count;
 	obj_request->which = img_request->obj_request_count;
 	rbd_assert(!obj_request_img_data_test(obj_request));
 	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);
 		ret = rbd_obj_request_submit(osdc, obj_request);
 		if (ret)
 		if (ret)
 			return 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;
 	return 0;