Commit 5107d7d5 authored by Xiubo Li's avatar Xiubo Li Committed by Ilya Dryomov
Browse files

ceph: move ceph_osdc_{read,write}pages to ceph.ko 



Since these helpers are only used by ceph.ko, move them there and
rename them with _sync_ qualifiers.

Signed-off-by: default avatarXiubo Li <xiubli@redhat.com>
Reviewed-by: default avatarJeff Layton <jlayton@kernel.org>
Signed-off-by: default avatarIlya Dryomov <idryomov@gmail.com>
parent 70837470

fs/ceph/addr.c

+84 −2
Original line number Diff line number Diff line
@@ -180,6 +180,47 @@ static int ceph_releasepage(struct page *page, gfp_t g) 
	return !PagePrivate(page);

}



/*

 * Read some contiguous pages.  If we cross a stripe boundary, shorten

 * *plen.  Return number of bytes read, or error.

 */

static int ceph_sync_readpages(struct ceph_fs_client *fsc,

			       struct ceph_vino vino,

			       struct ceph_file_layout *layout,

			       u64 off, u64 *plen,

			       u32 truncate_seq, u64 truncate_size,

			       struct page **pages, int num_pages,

			       int page_align)

{

	struct ceph_osd_client *osdc = &fsc->client->osdc;

	struct ceph_osd_request *req;

	int rc = 0;



	dout("readpages on ino %llx.%llx on %llu~%llu\n", vino.ino,

	     vino.snap, off, *plen);

	req = ceph_osdc_new_request(osdc, layout, vino, off, plen, 0, 1,

				    CEPH_OSD_OP_READ, CEPH_OSD_FLAG_READ,

				    NULL, truncate_seq, truncate_size,

				    false);

	if (IS_ERR(req))

		return PTR_ERR(req);



	/* it may be a short read due to an object boundary */

	osd_req_op_extent_osd_data_pages(req, 0,

				pages, *plen, page_align, false, false);



	dout("readpages  final extent is %llu~%llu (%llu bytes align %d)\n",

	     off, *plen, *plen, page_align);



	rc = ceph_osdc_start_request(osdc, req, false);

	if (!rc)

		rc = ceph_osdc_wait_request(osdc, req);



	ceph_osdc_put_request(req);

	dout("readpages result %d\n", rc);

	return rc;

}



/*

 * read a single page, without unlocking it.

 */
@@ -216,7 +257,7 @@ static int ceph_do_readpage(struct file *filp, struct page *page) 


	dout("readpage inode %p file %p page %p index %lu\n",

	     inode, filp, page, page->index);

	err = ceph_osdc_readpages(&fsc->client->osdc, ceph_vino(inode),

	err = ceph_sync_readpages(fsc, ceph_vino(inode),

				  &ci->i_layout, off, &len,

				  ci->i_truncate_seq, ci->i_truncate_size,

				  &page, 1, 0);
@@ -568,6 +609,47 @@ static u64 get_writepages_data_length(struct inode *inode, 
	return end > start ? end - start : 0;

}



/*

 * do a synchronous write on N pages

 */

static int ceph_sync_writepages(struct ceph_fs_client *fsc,

				struct ceph_vino vino,

				struct ceph_file_layout *layout,

				struct ceph_snap_context *snapc,

				u64 off, u64 len,

				u32 truncate_seq, u64 truncate_size,

				struct timespec64 *mtime,

				struct page **pages, int num_pages)

{

	struct ceph_osd_client *osdc = &fsc->client->osdc;

	struct ceph_osd_request *req;

	int rc = 0;

	int page_align = off & ~PAGE_MASK;



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

				    CEPH_OSD_OP_WRITE, CEPH_OSD_FLAG_WRITE,

				    snapc, truncate_seq, truncate_size,

				    true);

	if (IS_ERR(req))

		return PTR_ERR(req);



	/* it may be a short write due to an object boundary */

	osd_req_op_extent_osd_data_pages(req, 0, pages, len, page_align,

				false, false);

	dout("writepages %llu~%llu (%llu bytes)\n", off, len, len);



	req->r_mtime = *mtime;

	rc = ceph_osdc_start_request(osdc, req, true);

	if (!rc)

		rc = ceph_osdc_wait_request(osdc, req);



	ceph_osdc_put_request(req);

	if (rc == 0)

		rc = len;

	dout("writepages result %d\n", rc);

	return rc;

}



/*

 * Write a single page, but leave the page locked.

 *
@@ -626,7 +708,7 @@ static int writepage_nounlock(struct page *page, struct writeback_control *wbc) 
		set_bdi_congested(inode_to_bdi(inode), BLK_RW_ASYNC);



	set_page_writeback(page);

	err = ceph_osdc_writepages(&fsc->client->osdc, ceph_vino(inode),

	err = ceph_sync_writepages(fsc, ceph_vino(inode),

				   &ci->i_layout, snapc, page_off, len,

				   ceph_wbc.truncate_seq,

				   ceph_wbc.truncate_size,

include/linux/ceph/osd_client.h

+0 −17
Original line number Diff line number Diff line
@@ -509,23 +509,6 @@ int ceph_osdc_call(struct ceph_osd_client *osdc, 
		   struct page *req_page, size_t req_len,

		   struct page **resp_pages, size_t *resp_len);



extern int ceph_osdc_readpages(struct ceph_osd_client *osdc,

			       struct ceph_vino vino,

			       struct ceph_file_layout *layout,

			       u64 off, u64 *plen,

			       u32 truncate_seq, u64 truncate_size,

			       struct page **pages, int nr_pages,

			       int page_align);



extern int ceph_osdc_writepages(struct ceph_osd_client *osdc,

				struct ceph_vino vino,

				struct ceph_file_layout *layout,

				struct ceph_snap_context *sc,

				u64 off, u64 len,

				u32 truncate_seq, u64 truncate_size,

				struct timespec64 *mtime,

				struct page **pages, int nr_pages);



int ceph_osdc_copy_from(struct ceph_osd_client *osdc,

			u64 src_snapid, u64 src_version,

			struct ceph_object_id *src_oid,

net/ceph/osd_client.c

+0 −79
Original line number Diff line number Diff line
@@ -5228,85 +5228,6 @@ void ceph_osdc_stop(struct ceph_osd_client *osdc) 
	ceph_msgpool_destroy(&osdc->msgpool_op_reply);

}



/*

 * Read some contiguous pages.  If we cross a stripe boundary, shorten

 * *plen.  Return number of bytes read, or error.

 */

int ceph_osdc_readpages(struct ceph_osd_client *osdc,

			struct ceph_vino vino, struct ceph_file_layout *layout,

			u64 off, u64 *plen,

			u32 truncate_seq, u64 truncate_size,

			struct page **pages, int num_pages, int page_align)

{

	struct ceph_osd_request *req;

	int rc = 0;



	dout("readpages on ino %llx.%llx on %llu~%llu\n", vino.ino,

	     vino.snap, off, *plen);

	req = ceph_osdc_new_request(osdc, layout, vino, off, plen, 0, 1,

				    CEPH_OSD_OP_READ, CEPH_OSD_FLAG_READ,

				    NULL, truncate_seq, truncate_size,

				    false);

	if (IS_ERR(req))

		return PTR_ERR(req);



	/* it may be a short read due to an object boundary */

	osd_req_op_extent_osd_data_pages(req, 0,

				pages, *plen, page_align, false, false);



	dout("readpages  final extent is %llu~%llu (%llu bytes align %d)\n",

	     off, *plen, *plen, page_align);



	rc = ceph_osdc_start_request(osdc, req, false);

	if (!rc)

		rc = ceph_osdc_wait_request(osdc, req);



	ceph_osdc_put_request(req);

	dout("readpages result %d\n", rc);

	return rc;

}

EXPORT_SYMBOL(ceph_osdc_readpages);



/*

 * do a synchronous write on N pages

 */

int ceph_osdc_writepages(struct ceph_osd_client *osdc, struct ceph_vino vino,

			 struct ceph_file_layout *layout,

			 struct ceph_snap_context *snapc,

			 u64 off, u64 len,

			 u32 truncate_seq, u64 truncate_size,

			 struct timespec64 *mtime,

			 struct page **pages, int num_pages)

{

	struct ceph_osd_request *req;

	int rc = 0;

	int page_align = off & ~PAGE_MASK;



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

				    CEPH_OSD_OP_WRITE, CEPH_OSD_FLAG_WRITE,

				    snapc, truncate_seq, truncate_size,

				    true);

	if (IS_ERR(req))

		return PTR_ERR(req);



	/* it may be a short write due to an object boundary */

	osd_req_op_extent_osd_data_pages(req, 0, pages, len, page_align,

				false, false);

	dout("writepages %llu~%llu (%llu bytes)\n", off, len, len);



	req->r_mtime = *mtime;

	rc = ceph_osdc_start_request(osdc, req, true);

	if (!rc)

		rc = ceph_osdc_wait_request(osdc, req);



	ceph_osdc_put_request(req);

	if (rc == 0)

		rc = len;

	dout("writepages result %d\n", rc);

	return rc;

}

EXPORT_SYMBOL(ceph_osdc_writepages);



static int osd_req_op_copy_from_init(struct ceph_osd_request *req,

				     u64 src_snapid, u64 src_version,

				     struct ceph_object_id *src_oid,

CRA Git | Maintained and supported by SUSTech CRA and CCSE