summaryrefslogtreecommitdiffstats
path: root/fs/ceph/file.c
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 /fs/ceph/file.c
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 'fs/ceph/file.c')
-rw-r--r--fs/ceph/file.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/ceph/file.c b/fs/ceph/file.c
index f2754cdb5a03..d35fc05af06f 100644
--- a/fs/ceph/file.c
+++ b/fs/ceph/file.c
@@ -568,12 +568,12 @@ more:
if ((file->f_flags & O_SYNC) == 0) {
/* get a second commit callback */
req->r_safe_callback = sync_write_commit;
- req->r_own_pages = 1;
+ req->r_data.own_pages = 1;
}
}
- req->r_pages = pages;
- req->r_num_pages = num_pages;
- req->r_page_alignment = page_align;
+ req->r_data.pages = pages;
+ req->r_data.num_pages = num_pages;
+ req->r_data.alignment = page_align;
req->r_inode = inode;
ret = ceph_osdc_start_request(&fsc->client->osdc, req, false);