diff options
-rw-r--r-- | fs/ceph/addr.c | 3 | ||||
-rw-r--r-- | include/linux/ceph/osd_client.h | 3 | ||||
-rw-r--r-- | net/ceph/osd_client.c | 6 |
3 files changed, 4 insertions, 8 deletions
diff --git a/fs/ceph/addr.c b/fs/ceph/addr.c index bef552819312..8d3240d6f289 100644 --- a/fs/ceph/addr.c +++ b/fs/ceph/addr.c | |||
@@ -492,8 +492,7 @@ static int writepage_nounlock(struct page *page, struct writeback_control *wbc) | |||
492 | &ci->i_layout, snapc, | 492 | &ci->i_layout, snapc, |
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, &page, 1); |
496 | &page, 1, 0); | ||
497 | if (err < 0) { | 496 | if (err < 0) { |
498 | dout("writepage setting page/mapping error %d %p\n", err, page); | 497 | dout("writepage setting page/mapping error %d %p\n", err, page); |
499 | SetPageError(page); | 498 | SetPageError(page); |
diff --git a/include/linux/ceph/osd_client.h b/include/linux/ceph/osd_client.h index 7a63100a3e69..6540e8861998 100644 --- a/include/linux/ceph/osd_client.h +++ b/include/linux/ceph/osd_client.h | |||
@@ -274,8 +274,7 @@ extern int ceph_osdc_writepages(struct ceph_osd_client *osdc, | |||
274 | u64 off, u64 len, | 274 | u64 off, u64 len, |
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); | ||
279 | 278 | ||
280 | /* watch/notify events */ | 279 | /* watch/notify events */ |
281 | extern int ceph_osdc_create_event(struct ceph_osd_client *osdc, | 280 | 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 ac186b7c9986..d4e3812bcebc 100644 --- a/net/ceph/osd_client.c +++ b/net/ceph/osd_client.c | |||
@@ -1866,8 +1866,7 @@ int ceph_osdc_writepages(struct ceph_osd_client *osdc, struct ceph_vino vino, | |||
1866 | u64 off, u64 len, | 1866 | u64 off, u64 len, |
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) | ||
1871 | { | 1870 | { |
1872 | struct ceph_osd_request *req; | 1871 | struct ceph_osd_request *req; |
1873 | int rc = 0; | 1872 | int rc = 0; |
@@ -1876,8 +1875,7 @@ int ceph_osdc_writepages(struct ceph_osd_client *osdc, struct ceph_vino vino, | |||
1876 | BUG_ON(vino.snap != CEPH_NOSNAP); | 1875 | BUG_ON(vino.snap != CEPH_NOSNAP); |
1877 | req = ceph_osdc_new_request(osdc, layout, vino, off, &len, | 1876 | req = ceph_osdc_new_request(osdc, layout, vino, off, &len, |
1878 | CEPH_OSD_OP_WRITE, | 1877 | CEPH_OSD_OP_WRITE, |
1879 | flags | CEPH_OSD_FLAG_ONDISK | | 1878 | CEPH_OSD_FLAG_ONDISK | CEPH_OSD_FLAG_WRITE, |
1880 | CEPH_OSD_FLAG_WRITE, | ||
1881 | snapc, 0, | 1879 | snapc, 0, |
1882 | truncate_seq, truncate_size, mtime, | 1880 | truncate_seq, truncate_size, mtime, |
1883 | true, 1, page_align); | 1881 | true, 1, page_align); |