Commit 87f979d390f9ecfa3d0038a9f9a002a62f8a1895
1 parent
e7e319a9c5
Exists in
smarc-l5.0.0_1.0.0-ga
and in
5 other branches
ceph: kill ceph_osdc_writepages() "nofail" parameter
There is only one caller of ceph_osdc_writepages(), and it always
passes the value true as its "nofail" argument. Get rid of that
argument and replace its use in ceph_osdc_writepages() with the
constant value true.
This and a number of cleanup patches that follow resolve:
http://tracker.ceph.com/issues/4126
Signed-off-by: Alex Elder <elder@inktank.com>
Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
Showing 3 changed files with 5 additions and 5 deletions Side-by-side Diff
fs/ceph/addr.c
| ... | ... | @@ -493,7 +493,7 @@ |
| 493 | 493 | page_off, len, |
| 494 | 494 | ci->i_truncate_seq, ci->i_truncate_size, |
| 495 | 495 | &inode->i_mtime, |
| 496 | - &page, 1, 0, 0, true); | |
| 496 | + &page, 1, 0, 0); | |
| 497 | 497 | if (err < 0) { |
| 498 | 498 | dout("writepage setting page/mapping error %d %p\n", err, page); |
| 499 | 499 | SetPageError(page); |
include/linux/ceph/osd_client.h
| ... | ... | @@ -275,7 +275,7 @@ |
| 275 | 275 | u32 truncate_seq, u64 truncate_size, |
| 276 | 276 | struct timespec *mtime, |
| 277 | 277 | struct page **pages, int nr_pages, |
| 278 | - int flags, int do_sync, bool nofail); | |
| 278 | + int flags, int do_sync); | |
| 279 | 279 | |
| 280 | 280 | /* watch/notify events */ |
| 281 | 281 | extern int ceph_osdc_create_event(struct ceph_osd_client *osdc, |
net/ceph/osd_client.c
| ... | ... | @@ -1867,7 +1867,7 @@ |
| 1867 | 1867 | u32 truncate_seq, u64 truncate_size, |
| 1868 | 1868 | struct timespec *mtime, |
| 1869 | 1869 | struct page **pages, int num_pages, |
| 1870 | - int flags, int do_sync, bool nofail) | |
| 1870 | + int flags, int do_sync) | |
| 1871 | 1871 | { |
| 1872 | 1872 | struct ceph_osd_request *req; |
| 1873 | 1873 | int rc = 0; |
| ... | ... | @@ -1880,7 +1880,7 @@ |
| 1880 | 1880 | CEPH_OSD_FLAG_WRITE, |
| 1881 | 1881 | snapc, do_sync, |
| 1882 | 1882 | truncate_seq, truncate_size, mtime, |
| 1883 | - nofail, 1, page_align); | |
| 1883 | + true, 1, page_align); | |
| 1884 | 1884 | if (IS_ERR(req)) |
| 1885 | 1885 | return PTR_ERR(req); |
| 1886 | 1886 | |
| ... | ... | @@ -1889,7 +1889,7 @@ |
| 1889 | 1889 | dout("writepages %llu~%llu (%d pages)\n", off, len, |
| 1890 | 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 | 1893 | if (!rc) |
| 1894 | 1894 | rc = ceph_osdc_wait_request(osdc, req); |
| 1895 | 1895 |