ceph: fold ceph_sync_writepages into writepage_nounlock (6390987f) · Commits · 戴 / test

fs/ceph/addr.c

+35 −58

Original line number	Diff line number	Diff line
		@@ -591,50 +591,6 @@ 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_update_write_latency(&fsc->mdsc->metric, req->r_start_latency,
		req->r_end_latency, rc);

		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.
		*
		@@ -643,20 +599,19 @@ static int ceph_sync_writepages(struct ceph_fs_client *fsc,
		*/
		static int writepage_nounlock(struct page page, struct writeback_control wbc)
		{
		struct inode *inode;
		struct ceph_inode_info *ci;
		struct ceph_fs_client *fsc;
		struct inode *inode = page->mapping->host;
		struct ceph_inode_info *ci = ceph_inode(inode);
		struct ceph_fs_client *fsc = ceph_inode_to_client(inode);
		struct ceph_snap_context snapc, oldest;
		loff_t page_off = page_offset(page);
		int err, len = PAGE_SIZE;
		int err;
		loff_t len = PAGE_SIZE;
		struct ceph_writeback_ctl ceph_wbc;
		struct ceph_osd_client *osdc = &fsc->client->osdc;
		struct ceph_osd_request *req;

		dout("writepage %p idx %lu\n", page, page->index);

		inode = page->mapping->host;
		ci = ceph_inode(inode);
		fsc = ceph_inode_to_client(inode);

		/* verify this is a writeable snap context */
		snapc = page_snap_context(page);
		if (!snapc) {
		@@ -685,7 +640,7 @@ static int writepage_nounlock(struct page page, struct writeback_control wbc)
		if (ceph_wbc.i_size < page_off + len)
		len = ceph_wbc.i_size - page_off;

		dout("writepage %p page %p index %lu on %llu~%u snapc %p seq %lld\n",
		dout("writepage %p page %p index %lu on %llu~%llu snapc %p seq %lld\n",
		inode, page, page->index, page_off, len, snapc, snapc->seq);

		if (atomic_long_inc_return(&fsc->writeback_count) >
		@@ -693,11 +648,33 @@ 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_sync_writepages(fsc, ceph_vino(inode),
		&ci->i_layout, snapc, page_off, len,
		ceph_wbc.truncate_seq,
		ceph_wbc.truncate_size,
		&inode->i_mtime, &page, 1);
		req = ceph_osdc_new_request(osdc, &ci->i_layout, ceph_vino(inode), page_off, &len, 0, 1,
		CEPH_OSD_OP_WRITE, CEPH_OSD_FLAG_WRITE, snapc,
		ceph_wbc.truncate_seq, ceph_wbc.truncate_size,
		true);
		if (IS_ERR(req)) {
		redirty_page_for_writepage(wbc, page);
		end_page_writeback(page);
		return PTR_ERR(req);
		}

		/* it may be a short write due to an object boundary */
		WARN_ON_ONCE(len > PAGE_SIZE);
		osd_req_op_extent_osd_data_pages(req, 0, &page, len, 0, false, false);
		dout("writepage %llu~%llu (%llu bytes)\n", page_off, len, len);

		req->r_mtime = inode->i_mtime;
		err = ceph_osdc_start_request(osdc, req, true);
		if (!err)
		err = ceph_osdc_wait_request(osdc, req);

		ceph_update_write_latency(&fsc->mdsc->metric, req->r_start_latency,
		req->r_end_latency, err);

		ceph_osdc_put_request(req);
		if (err == 0)
		err = len;

		if (err < 0) {
		struct writeback_control tmp_wbc;
		if (!wbc)

Admin message