From abdb5783b6378892c01c18ffba8e6b9332f9cdf4 Mon Sep 17 00:00:00 2001 From: Alex Elder Date: Mon, 6 May 2013 17:40:32 -0500 Subject: [PATCH] --- yaml --- r: 375599 b: refs/heads/master c: 91c6febb3817be576785ef06aeaaa8ed423e0a2a h: refs/heads/master i: 375597: 8e370aaec13e9a061e79ec062adb18c0176e16ab 375595: cfe1d9a9c86d1094f6af05575ab7c14c2c2398d9 375591: 013e47652c10e13acdb91e2039808a74a26f8159 375583: d8609cee5c18c9caaf3bbf0789458d5c060757e7 v: v3 --- [refs] | 2 +- trunk/drivers/block/rbd.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index bcaea7301f6a..9401468b19c0 100644 --- 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 index 0d874a546949..15ac2a54d4f3 100644 --- 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;