f2fs: call SetPageUptodate if needed

SetPageUptodate() issues memory barrier, resulting in performance degrdation.
Let's avoid that.

Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>

diff --git a/fs/f2fs/checkpoint.c b/fs/f2fs/checkpoint.c
index 2755ef730a41500bc9be68f0b6d9ccbb15f884fb..8ea895389ae44a57c852b04956e1e6d5fb69e07b 100644 (file)
--- a/fs/f2fs/checkpoint.c
+++ b/fs/f2fs/checkpoint.c
@@ -48,7 +48,8 @@ repeat:
                goto repeat;
        }
        f2fs_wait_on_page_writeback(page, META, true);
-       SetPageUptodate(page);
+       if (!PageUptodate(page))
+               SetPageUptodate(page);
        return page;
 }
 
@@ -364,7 +365,8 @@ static int f2fs_set_meta_page_dirty(struct page *page)
 {
        trace_f2fs_set_page_dirty(page, META);
 
-       SetPageUptodate(page);
+       if (!PageUptodate(page))
+               SetPageUptodate(page);
        if (!PageDirty(page)) {
                f2fs_set_page_dirty_nobuffers(page);
                inc_page_count(F2FS_P_SB(page), F2FS_DIRTY_META);

diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c
index 4a2e97dad9e907aa69b9bd4cba08afb6fa4edd79..b6fd5bd05e41bd91f706dedb792d71e05c69939f 100644 (file)
--- a/fs/f2fs/data.c
+++ b/fs/f2fs/data.c
@@ -47,7 +47,8 @@ static void f2fs_read_end_io(struct bio *bio)
                struct page *page = bvec->bv_page;
 
                if (!bio->bi_error) {
-                       SetPageUptodate(page);
+                       if (!PageUptodate(page))
+                               SetPageUptodate(page);
                } else {
                        ClearPageUptodate(page);
                        SetPageError(page);
@@ -443,7 +444,8 @@ got_it:
         */
        if (dn.data_blkaddr == NEW_ADDR) {
                zero_user_segment(page, 0, PAGE_SIZE);
-               SetPageUptodate(page);
+               if (!PageUptodate(page))
+                       SetPageUptodate(page);
                unlock_page(page);
                return page;
        }
@@ -554,7 +556,8 @@ struct page *get_new_data_page(struct inode *inode,
 
        if (dn.data_blkaddr == NEW_ADDR) {
                zero_user_segment(page, 0, PAGE_SIZE);
-               SetPageUptodate(page);
+               if (!PageUptodate(page))
+                       SetPageUptodate(page);
        } else {
                f2fs_put_page(page, 1);
 
@@ -1065,7 +1068,8 @@ got_it:
                        }
                } else {
                        zero_user_segment(page, 0, PAGE_SIZE);
-                       SetPageUptodate(page);
+                       if (!PageUptodate(page))
+                               SetPageUptodate(page);
                        unlock_page(page);
                        goto next_page;
                }
@@ -1659,7 +1663,8 @@ repeat:
                }
        }
 out_update:
-       SetPageUptodate(page);
+       if (!PageUptodate(page))
+               SetPageUptodate(page);
 out_clear:
        clear_cold_data(page);
        return 0;
@@ -1813,7 +1818,8 @@ static int f2fs_set_data_page_dirty(struct page *page)
 
        trace_f2fs_set_page_dirty(page, DATA);
 
-       SetPageUptodate(page);
+       if (!PageUptodate(page))
+               SetPageUptodate(page);
 
        if (f2fs_is_atomic_file(inode)) {
                if (!IS_ATOMIC_WRITTEN_PAGE(page)) {

diff --git a/fs/f2fs/file.c b/fs/f2fs/file.c
index d07e7759f970945b15f6c46756050209c22a2e01..2b777a42bf437452ec081870cc390022926c7bba 100644 (file)
--- a/fs/f2fs/file.c
+++ b/fs/f2fs/file.c
@@ -81,7 +81,8 @@ static int f2fs_vm_page_mkwrite(struct vm_area_struct *vma,
                zero_user_segment(page, offset, PAGE_SIZE);
        }
        set_page_dirty(page);
-       SetPageUptodate(page);
+       if (!PageUptodate(page))
+               SetPageUptodate(page);
 
        trace_f2fs_vm_page_mkwrite(page, DATA);
 mapped:

diff --git a/fs/f2fs/inline.c b/fs/f2fs/inline.c
index e10e958250ff745a65ab05ddad786acaacc61b36..2cd0edcc4ebcfbf485b24fe988873dfb2414b1f9 100644 (file)
--- a/fs/f2fs/inline.c
+++ b/fs/f2fs/inline.c
@@ -59,7 +59,8 @@ void read_inline_data(struct page *page, struct page *ipage)
        memcpy(dst_addr, src_addr, MAX_INLINE_DATA);
        flush_dcache_page(page);
        kunmap_atomic(dst_addr);
-       SetPageUptodate(page);
+       if (!PageUptodate(page))
+               SetPageUptodate(page);
 }
 
 bool truncate_inline_inode(struct page *ipage, u64 from)
@@ -97,7 +98,8 @@ int f2fs_read_inline_data(struct inode *inode, struct page *page)
        else
                read_inline_data(page, ipage);
 
-       SetPageUptodate(page);
+       if (!PageUptodate(page))
+               SetPageUptodate(page);
        f2fs_put_page(ipage, 1);
        unlock_page(page);
        return 0;
@@ -370,7 +372,8 @@ static int f2fs_move_inline_dirents(struct inode *dir, struct page *ipage,
                                        NR_INLINE_DENTRY * F2FS_SLOT_LEN);
 
        kunmap_atomic(dentry_blk);
-       SetPageUptodate(page);
+       if (!PageUptodate(page))
+               SetPageUptodate(page);
        set_page_dirty(page);
 
        /* clear inline dir and flag after data writeback */

diff --git a/fs/f2fs/node.c b/fs/f2fs/node.c
index db73f3c823dce371ea65bb7ebd60cf920022efbc..ca1bb3cc6c32b5ecac355a171c70ffab0688b1a9 100644 (file)
--- a/fs/f2fs/node.c
+++ b/fs/f2fs/node.c
@@ -1045,7 +1045,8 @@ struct page *new_node_page(struct dnode_of_data *dn,
        f2fs_wait_on_page_writeback(page, NODE, true);
        fill_node_footer(page, dn->nid, dn->inode->i_ino, ofs, true);
        set_cold_node(dn->inode, page);
-       SetPageUptodate(page);
+       if (!PageUptodate(page))
+               SetPageUptodate(page);
        if (set_page_dirty(page))
                dn->node_changed = true;
 
@@ -1644,7 +1645,8 @@ static int f2fs_set_node_page_dirty(struct page *page)
 {
        trace_f2fs_set_page_dirty(page, NODE);
 
-       SetPageUptodate(page);
+       if (!PageUptodate(page))
+               SetPageUptodate(page);
        if (!PageDirty(page)) {
                f2fs_set_page_dirty_nobuffers(page);
                inc_page_count(F2FS_P_SB(page), F2FS_DIRTY_NODES);
@@ -2015,7 +2017,8 @@ int recover_inode_page(struct f2fs_sb_info *sbi, struct page *page)
        /* Should not use this inode from free nid list */
        remove_free_nid(NM_I(sbi), ino);
 
-       SetPageUptodate(ipage);
+       if (!PageUptodate(ipage))
+               SetPageUptodate(ipage);
        fill_node_footer(ipage, ino, ino, 0, true);
 
        src = F2FS_INODE(page);