Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 24808826 authored by Alex Elder's avatar Alex Elder
Browse files

ceph: kill ceph_osdc_writepages() "flags" parameter 



There is only one caller of ceph_osdc_writepages(), and it always
passes 0 as its "flags" argument.  Get rid of that argument and
replace its use in ceph_osdc_writepages() with 0.

Signed-off-by: default avatarAlex Elder <elder@inktank.com>
Reviewed-by: default avatarJosh Durgin <josh.durgin@inktank.com>
parent fbf8685f

fs/ceph/addr.c

+1 −2
Original line number Diff line number Diff line
@@ -492,8 +492,7 @@ static int writepage_nounlock(struct page *page, struct writeback_control *wbc) 
				   &ci->i_layout, snapc,

				   page_off, len,

				   ci->i_truncate_seq, ci->i_truncate_size,

				   &inode->i_mtime,

				   &page, 1, 0);

				   &inode->i_mtime, &page, 1);

	if (err < 0) {

		dout("writepage setting page/mapping error %d %p\n", err, page);

		SetPageError(page);

include/linux/ceph/osd_client.h

+1 −2
Original line number Diff line number Diff line
@@ -274,8 +274,7 @@ extern int ceph_osdc_writepages(struct ceph_osd_client *osdc, 
				u64 off, u64 len,

				u32 truncate_seq, u64 truncate_size,

				struct timespec *mtime,

				struct page **pages, int nr_pages,

				int flags);

				struct page **pages, int nr_pages);



/* watch/notify events */

extern int ceph_osdc_create_event(struct ceph_osd_client *osdc,

net/ceph/osd_client.c

+2 −4
Original line number Diff line number Diff line
@@ -1866,8 +1866,7 @@ int ceph_osdc_writepages(struct ceph_osd_client *osdc, struct ceph_vino vino, 
			 u64 off, u64 len,

			 u32 truncate_seq, u64 truncate_size,

			 struct timespec *mtime,

			 struct page **pages, int num_pages,

			 int flags)

			 struct page **pages, int num_pages)

{

	struct ceph_osd_request *req;

	int rc = 0;
@@ -1876,8 +1875,7 @@ int ceph_osdc_writepages(struct ceph_osd_client *osdc, struct ceph_vino vino, 
	BUG_ON(vino.snap != CEPH_NOSNAP);

	req = ceph_osdc_new_request(osdc, layout, vino, off, &len,

				    CEPH_OSD_OP_WRITE,

				    flags | CEPH_OSD_FLAG_ONDISK |

					    CEPH_OSD_FLAG_WRITE,

				    CEPH_OSD_FLAG_ONDISK | CEPH_OSD_FLAG_WRITE,

				    snapc, 0,

				    truncate_seq, truncate_size, mtime,

				    true, 1, page_align);