diff options
-rw-r--r-- | fs/ceph/addr.c | 2 | ||||
-rw-r--r-- | include/linux/ceph/osd_client.h | 2 | ||||
-rw-r--r-- | net/ceph/osd_client.c | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/fs/ceph/addr.c b/fs/ceph/addr.c index 064d1a68d2c1..c7e401c96fc9 100644 --- a/fs/ceph/addr.c +++ b/fs/ceph/addr.c | |||
@@ -493,7 +493,7 @@ static int writepage_nounlock(struct page *page, struct writeback_control *wbc) | |||
493 | page_off, len, | 493 | page_off, len, |
494 | ci->i_truncate_seq, ci->i_truncate_size, | 494 | ci->i_truncate_seq, ci->i_truncate_size, |
495 | &inode->i_mtime, | 495 | &inode->i_mtime, |
496 | &page, 1, 0, 0, true); | 496 | &page, 1, 0, 0); |
497 | if (err < 0) { | 497 | if (err < 0) { |
498 | dout("writepage setting page/mapping error %d %p\n", err, page); | 498 | dout("writepage setting page/mapping error %d %p\n", err, page); |
499 | SetPageError(page); | 499 | SetPageError(page); |
diff --git a/include/linux/ceph/osd_client.h b/include/linux/ceph/osd_client.h index 82bf6338d6c1..afcb255b016a 100644 --- a/include/linux/ceph/osd_client.h +++ b/include/linux/ceph/osd_client.h | |||
@@ -275,7 +275,7 @@ extern int ceph_osdc_writepages(struct ceph_osd_client *osdc, | |||
275 | u32 truncate_seq, u64 truncate_size, | 275 | u32 truncate_seq, u64 truncate_size, |
276 | struct timespec *mtime, | 276 | struct timespec *mtime, |
277 | struct page **pages, int nr_pages, | 277 | struct page **pages, int nr_pages, |
278 | int flags, int do_sync, bool nofail); | 278 | int flags, int do_sync); |
279 | 279 | ||
280 | /* watch/notify events */ | 280 | /* watch/notify events */ |
281 | extern int ceph_osdc_create_event(struct ceph_osd_client *osdc, | 281 | extern int ceph_osdc_create_event(struct ceph_osd_client *osdc, |
diff --git a/net/ceph/osd_client.c b/net/ceph/osd_client.c index d9d58bbe9f9a..dd01b1340e95 100644 --- a/net/ceph/osd_client.c +++ b/net/ceph/osd_client.c | |||
@@ -1867,7 +1867,7 @@ int ceph_osdc_writepages(struct ceph_osd_client *osdc, struct ceph_vino vino, | |||
1867 | u32 truncate_seq, u64 truncate_size, | 1867 | u32 truncate_seq, u64 truncate_size, |
1868 | struct timespec *mtime, | 1868 | struct timespec *mtime, |
1869 | struct page **pages, int num_pages, | 1869 | struct page **pages, int num_pages, |
1870 | int flags, int do_sync, bool nofail) | 1870 | int flags, int do_sync) |
1871 | { | 1871 | { |
1872 | struct ceph_osd_request *req; | 1872 | struct ceph_osd_request *req; |
1873 | int rc = 0; | 1873 | int rc = 0; |
@@ -1880,7 +1880,7 @@ int ceph_osdc_writepages(struct ceph_osd_client *osdc, struct ceph_vino vino, | |||
1880 | CEPH_OSD_FLAG_WRITE, | 1880 | CEPH_OSD_FLAG_WRITE, |
1881 | snapc, do_sync, | 1881 | snapc, do_sync, |
1882 | truncate_seq, truncate_size, mtime, | 1882 | truncate_seq, truncate_size, mtime, |
1883 | nofail, 1, page_align); | 1883 | true, 1, page_align); |
1884 | if (IS_ERR(req)) | 1884 | if (IS_ERR(req)) |
1885 | return PTR_ERR(req); | 1885 | return PTR_ERR(req); |
1886 | 1886 | ||
@@ -1889,7 +1889,7 @@ int ceph_osdc_writepages(struct ceph_osd_client *osdc, struct ceph_vino vino, | |||
1889 | dout("writepages %llu~%llu (%d pages)\n", off, len, | 1889 | dout("writepages %llu~%llu (%d pages)\n", off, len, |
1890 | req->r_num_pages); | 1890 | req->r_num_pages); |
1891 | 1891 | ||
1892 | rc = ceph_osdc_start_request(osdc, req, nofail); | 1892 | rc = ceph_osdc_start_request(osdc, req, true); |
1893 | if (!rc) | 1893 | if (!rc) |
1894 | rc = ceph_osdc_wait_request(osdc, req); | 1894 | rc = ceph_osdc_wait_request(osdc, req); |
1895 | 1895 | ||