aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--fs/ceph/addr.c4
-rw-r--r--fs/ceph/file.c2
-rw-r--r--include/linux/ceph/osd_client.h3
-rw-r--r--net/ceph/osd_client.c6
4 files changed, 7 insertions, 8 deletions
diff --git a/fs/ceph/addr.c b/fs/ceph/addr.c
index 8d3240d6f289..fc613715af46 100644
--- a/fs/ceph/addr.c
+++ b/fs/ceph/addr.c
@@ -315,7 +315,7 @@ static int start_read(struct inode *inode, struct list_head *page_list, int max)
315 CEPH_OSD_OP_READ, CEPH_OSD_FLAG_READ, 315 CEPH_OSD_OP_READ, CEPH_OSD_FLAG_READ,
316 NULL, 0, 316 NULL, 0,
317 ci->i_truncate_seq, ci->i_truncate_size, 317 ci->i_truncate_seq, ci->i_truncate_size,
318 NULL, false, 1, 0); 318 NULL, false, 0);
319 if (IS_ERR(req)) 319 if (IS_ERR(req))
320 return PTR_ERR(req); 320 return PTR_ERR(req);
321 321
@@ -837,7 +837,7 @@ get_more_pages:
837 snapc, do_sync, 837 snapc, do_sync,
838 ci->i_truncate_seq, 838 ci->i_truncate_seq,
839 ci->i_truncate_size, 839 ci->i_truncate_size,
840 &inode->i_mtime, true, 1, 0); 840 &inode->i_mtime, true, 0);
841 841
842 if (IS_ERR(req)) { 842 if (IS_ERR(req)) {
843 rc = PTR_ERR(req); 843 rc = PTR_ERR(req);
diff --git a/fs/ceph/file.c b/fs/ceph/file.c
index a1e5b81e8118..9c4325e654ca 100644
--- a/fs/ceph/file.c
+++ b/fs/ceph/file.c
@@ -541,7 +541,7 @@ more:
541 ci->i_snap_realm->cached_context, 541 ci->i_snap_realm->cached_context,
542 do_sync, 542 do_sync,
543 ci->i_truncate_seq, ci->i_truncate_size, 543 ci->i_truncate_seq, ci->i_truncate_size,
544 &mtime, false, 2, page_align); 544 &mtime, false, page_align);
545 if (IS_ERR(req)) 545 if (IS_ERR(req))
546 return PTR_ERR(req); 546 return PTR_ERR(req);
547 547
diff --git a/include/linux/ceph/osd_client.h b/include/linux/ceph/osd_client.h
index 6540e8861998..5812802bd8ae 100644
--- a/include/linux/ceph/osd_client.h
+++ b/include/linux/ceph/osd_client.h
@@ -234,8 +234,7 @@ extern struct ceph_osd_request *ceph_osdc_new_request(struct ceph_osd_client *,
234 int do_sync, u32 truncate_seq, 234 int do_sync, u32 truncate_seq,
235 u64 truncate_size, 235 u64 truncate_size,
236 struct timespec *mtime, 236 struct timespec *mtime,
237 bool use_mempool, int num_reply, 237 bool use_mempool, int page_align);
238 int page_align);
239 238
240extern void ceph_osdc_set_request_linger(struct ceph_osd_client *osdc, 239extern void ceph_osdc_set_request_linger(struct ceph_osd_client *osdc,
241 struct ceph_osd_request *req); 240 struct ceph_osd_request *req);
diff --git a/net/ceph/osd_client.c b/net/ceph/osd_client.c
index d4e3812bcebc..d3e75138506b 100644
--- a/net/ceph/osd_client.c
+++ b/net/ceph/osd_client.c
@@ -393,7 +393,7 @@ struct ceph_osd_request *ceph_osdc_new_request(struct ceph_osd_client *osdc,
393 u32 truncate_seq, 393 u32 truncate_seq,
394 u64 truncate_size, 394 u64 truncate_size,
395 struct timespec *mtime, 395 struct timespec *mtime,
396 bool use_mempool, int num_reply, 396 bool use_mempool,
397 int page_align) 397 int page_align)
398{ 398{
399 struct ceph_osd_req_op ops[2]; 399 struct ceph_osd_req_op ops[2];
@@ -1837,7 +1837,7 @@ int ceph_osdc_readpages(struct ceph_osd_client *osdc,
1837 req = ceph_osdc_new_request(osdc, layout, vino, off, plen, 1837 req = ceph_osdc_new_request(osdc, layout, vino, off, plen,
1838 CEPH_OSD_OP_READ, CEPH_OSD_FLAG_READ, 1838 CEPH_OSD_OP_READ, CEPH_OSD_FLAG_READ,
1839 NULL, 0, truncate_seq, truncate_size, NULL, 1839 NULL, 0, truncate_seq, truncate_size, NULL,
1840 false, 1, page_align); 1840 false, page_align);
1841 if (IS_ERR(req)) 1841 if (IS_ERR(req))
1842 return PTR_ERR(req); 1842 return PTR_ERR(req);
1843 1843
@@ -1878,7 +1878,7 @@ int ceph_osdc_writepages(struct ceph_osd_client *osdc, struct ceph_vino vino,
1878 CEPH_OSD_FLAG_ONDISK | CEPH_OSD_FLAG_WRITE, 1878 CEPH_OSD_FLAG_ONDISK | CEPH_OSD_FLAG_WRITE,
1879 snapc, 0, 1879 snapc, 0,
1880 truncate_seq, truncate_size, mtime, 1880 truncate_seq, truncate_size, mtime,
1881 true, 1, page_align); 1881 true, page_align);
1882 if (IS_ERR(req)) 1882 if (IS_ERR(req))
1883 return PTR_ERR(req); 1883 return PTR_ERR(req);
1884 1884