Commit 4f8219f8 authored by Fengnan Chang's avatar Fengnan Chang Committed by Jaegeuk Kim
Browse files

f2fs: intorduce f2fs_all_cluster_page_ready 



When write total cluster, all pages is uptodate, there is not need to call
f2fs_prepare_compress_overwrite, intorduce f2fs_all_cluster_page_ready
to avoid this.

Signed-off-by: default avatarFengnan Chang <changfengnan@vivo.com>
Reviewed-by: default avatarChao Yu <chao@kernel.org>
Signed-off-by: default avatarJaegeuk Kim <jaegeuk@kernel.org>
parent e53f8643

fs/f2fs/compress.c

+14 −7
Original line number Diff line number Diff line
@@ -841,20 +841,27 @@ bool f2fs_cluster_can_merge_page(struct compress_ctx *cc, pgoff_t index) 
	return is_page_in_cluster(cc, index);

}



bool f2fs_all_cluster_page_loaded(struct compress_ctx *cc, struct pagevec *pvec,

				int index, int nr_pages)

bool f2fs_all_cluster_page_ready(struct compress_ctx *cc, struct pagevec *pvec,

				int index, int nr_pages, bool uptodate)

{

	unsigned long pgidx;

	int i;

	unsigned long pgidx = pvec->pages[index]->index;

	int i = uptodate ? 0 : 1;



	if (nr_pages - index < cc->cluster_size)

	/*

	 * when uptodate set to true, try to check all pages in cluster is

	 * uptodate or not.

	 */

	if (uptodate && (pgidx % cc->cluster_size))

		return false;



	pgidx = pvec->pages[index]->index;

	if (nr_pages - index < cc->cluster_size)

		return false;



	for (i = 1; i < cc->cluster_size; i++) {

	for (; i < cc->cluster_size; i++) {

		if (pvec->pages[index + i]->index != pgidx + i)

			return false;

		if (uptodate && !PageUptodate(pvec->pages[index + i]))

			return false;

	}



	return true;

fs/f2fs/data.c

+6 −2
Original line number Diff line number Diff line
@@ -3011,6 +3011,10 @@ static int f2fs_write_cache_pages(struct address_space *mapping, 
				if (!f2fs_cluster_is_empty(&cc))

					goto lock_page;



				if (f2fs_all_cluster_page_ready(&cc,

					&pvec, i, nr_pages, true))

					goto lock_page;



				ret2 = f2fs_prepare_compress_overwrite(

							inode, &pagep,

							page->index, &fsdata);
@@ -3021,8 +3025,8 @@ static int f2fs_write_cache_pages(struct address_space *mapping, 
				} else if (ret2 &&

					(!f2fs_compress_write_end(inode,

						fsdata, page->index, 1) ||

					 !f2fs_all_cluster_page_loaded(&cc,

						&pvec, i, nr_pages))) {

					 !f2fs_all_cluster_page_ready(&cc,

						&pvec, i, nr_pages, false))) {

					retry = 1;

					break;

				}

fs/f2fs/f2fs.h

+2 −2
Original line number Diff line number Diff line
@@ -4198,8 +4198,8 @@ void f2fs_end_read_compressed_page(struct page *page, bool failed, 
				block_t blkaddr, bool in_task);

bool f2fs_cluster_is_empty(struct compress_ctx *cc);

bool f2fs_cluster_can_merge_page(struct compress_ctx *cc, pgoff_t index);

bool f2fs_all_cluster_page_loaded(struct compress_ctx *cc, struct pagevec *pvec,

				int index, int nr_pages);

bool f2fs_all_cluster_page_ready(struct compress_ctx *cc, struct pagevec *pvec,

				int index, int nr_pages, bool uptodate);

bool f2fs_sanity_check_cluster(struct dnode_of_data *dn);

void f2fs_compress_ctx_add_page(struct compress_ctx *cc, struct page *page);

int f2fs_write_multi_pages(struct compress_ctx *cc,