summaryrefslogtreecommitdiffstats
path: root/fs/ceph
diff options
context:
space:
mode:
authorYan, Zheng <zyan@redhat.com>2015-04-27 11:09:54 +0800
committerIlya Dryomov <idryomov@gmail.com>2015-06-25 11:49:27 +0300
commit144cba1493fdd6e3e1980e439a31df877831ebcd (patch)
tree3fef5404a6e0186cef9de8ce2df5a0077202a2a4 /fs/ceph
parent66ba609f7b96096116ca7bbc21ec6922ea41a992 (diff)
downloadlinux-stable-144cba1493fdd6e3e1980e439a31df877831ebcd.tar.gz
linux-stable-144cba1493fdd6e3e1980e439a31df877831ebcd.tar.bz2
linux-stable-144cba1493fdd6e3e1980e439a31df877831ebcd.zip
libceph: allow setting osd_req_op's flags
Signed-off-by: Yan, Zheng <zyan@redhat.com> Reviewed-by: Alex Elder <elder@linaro.org>
Diffstat (limited to 'fs/ceph')
-rw-r--r--fs/ceph/addr.c3
-rw-r--r--fs/ceph/file.c2
2 files changed, 3 insertions, 2 deletions
diff --git a/fs/ceph/addr.c b/fs/ceph/addr.c
index e162bcd105ee..feeaf3b65fa0 100644
--- a/fs/ceph/addr.c
+++ b/fs/ceph/addr.c
@@ -884,7 +884,8 @@ get_more_pages:
}
if (do_sync)
- osd_req_op_init(req, 1, CEPH_OSD_OP_STARTSYNC);
+ osd_req_op_init(req, 1,
+ CEPH_OSD_OP_STARTSYNC, 0);
req->r_callback = writepages_finish;
req->r_inode = inode;
diff --git a/fs/ceph/file.c b/fs/ceph/file.c
index 3b6b522b4b31..777eb21d556f 100644
--- a/fs/ceph/file.c
+++ b/fs/ceph/file.c
@@ -614,7 +614,7 @@ ceph_sync_direct_write(struct kiocb *iocb, struct iov_iter *from, loff_t pos)
break;
}
- osd_req_op_init(req, 1, CEPH_OSD_OP_STARTSYNC);
+ osd_req_op_init(req, 1, CEPH_OSD_OP_STARTSYNC, 0);
n = iov_iter_get_pages_alloc(from, &pages, len, &start);
if (unlikely(n < 0)) {