summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorAlex Elder <elder@inktank.com>2013-02-14 19:16:43 +0100
committerSage Weil <sage@inktank.com>2013-05-02 06:16:24 +0200
commit2794a82a11cfeae0890741b18b0049ddb55ce646 (patch)
tree9dc71c4a7d95fceed3942418586c5ced230ecdc2 /drivers
parentlibceph: don't assign page info in ceph_osdc_new_request() (diff)
downloadlinux-2794a82a11cfeae0890741b18b0049ddb55ce646.tar.xz
linux-2794a82a11cfeae0890741b18b0049ddb55ce646.zip
libceph: separate osd request data info
Pull the fields in an osd request structure that define the data for the request out into a separate structure. Signed-off-by: Alex Elder <elder@inktank.com> Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/block/rbd.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c
index b7b7a88d9f68..0e814dfda48e 100644
--- a/drivers/block/rbd.c
+++ b/drivers/block/rbd.c
@@ -1425,12 +1425,12 @@ static struct ceph_osd_request *rbd_osd_req_create(
break; /* Nothing to do */
case OBJ_REQUEST_BIO:
rbd_assert(obj_request->bio_list != NULL);
- osd_req->r_bio = obj_request->bio_list;
+ osd_req->r_data.bio = obj_request->bio_list;
break;
case OBJ_REQUEST_PAGES:
- osd_req->r_pages = obj_request->pages;
- osd_req->r_num_pages = obj_request->page_count;
- osd_req->r_page_alignment = offset & ~PAGE_MASK;
+ osd_req->r_data.pages = obj_request->pages;
+ osd_req->r_data.num_pages = obj_request->page_count;
+ osd_req->r_data.alignment = offset & ~PAGE_MASK;
break;
}