diff options
author | Alex Elder <elder@inktank.com> | 2013-02-15 12:42:29 -0500 |
---|---|---|
committer | Alex Elder <elder@inktank.com> | 2013-02-18 13:19:22 -0500 |
commit | 87f979d390f9ecfa3d0038a9f9a002a62f8a1895 (patch) | |
tree | a1202bf2d1b29541f31875b9445d446d5cf5bfe9 /net/ceph | |
parent | e7e319a9c51409c7effe34333ea26facf2fab9e1 (diff) |
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>
Diffstat (limited to 'net/ceph')
-rw-r--r-- | net/ceph/osd_client.c | 6 |
1 files changed, 3 insertions, 3 deletions
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 | ||