---

yaml --- r: 375599 b: refs/heads/master c: 91c6feb h: refs/heads/master i: 375597: 8e370aa 375595: cfe1d9a 375591: 013e476 375583: d8609ce v: v3
git-mirror · May 9, 2013 · abdb578 · abdb578
1 parent bf04e5e
commit abdb578
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2df3fac75851dc4257b90dc72fdd3cf27ba177bc
+refs/heads/master: 91c6febb3817be576785ef06aeaaa8ed423e0a2a
diff --git a/trunk/drivers/block/rbd.c b/trunk/drivers/block/rbd.c
@@ -2186,13 +2186,13 @@ rbd_img_obj_parent_read_full_callback(struct rbd_img_request *img_request)
 	result = img_request->result;
 	obj_size = img_request->length;
 	xferred = img_request->xferred;
+	rbd_img_request_put(img_request);
 
-	rbd_dev = img_request->rbd_dev;
+	rbd_assert(orig_request->img_request);
+	rbd_dev = orig_request->img_request->rbd_dev;
 	rbd_assert(rbd_dev);
 	rbd_assert(obj_size == (u64)1 << rbd_dev->header.obj_order);
 
-	rbd_img_request_put(img_request);
-
 	if (result)
 		goto out_err;