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: Fengnan Chang <changfeng...@vivo.com>
---
fs/f2fs/compress.c | 11 ++++++++---
fs/f2fs/data.c | 9 +++++++--
fs/f2fs/f2fs.h | 4 ++--
3 files changed, 17 insertions(+), 7 deletions(-)
diff --git a/fs/f2fs/compress.c b/fs/f2fs/compress.c
index 12a56f9e1572..fd28844aa53f 100644
--- a/fs/f2fs/compress.c
+++ b/fs/f2fs/compress.c
@@ -871,20 +871,25 @@ 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;
+ if (uptodate && (pgidx % cc->cluster_size))
+ return false;
+
if (nr_pages - index < cc->cluster_size)
return false;
pgidx = pvec->pages[index]->index;
- for (i = 1; i < cc->cluster_size; i++) {
+ for (i = 0; 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;
diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c
index 9a1a526f2092..77af65838a7c 100644
--- a/fs/f2fs/data.c
+++ b/fs/f2fs/data.c
@@ -2967,6 +2967,11 @@ 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);
@@ -2977,8 +2982,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;
}
diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h
index 38cbed0f544e..5a33f2d4aee8 100644
--- a/fs/f2fs/f2fs.h
+++ b/fs/f2fs/f2fs.h
@@ -4177,8 +4177,8 @@ void f2fs_end_read_compressed_page(struct page *page,
bool failed,
block_t blkaddr);
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,
--
2.35.1
_______________________________________________
Linux-f2fs-devel mailing list
Linux-f2fs-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
