btrfs: remove redundant calls to flush_dcache_page

Both memzero_page and memcpy_to_page already call flush_dcache_page so
we can remove the calls from btrfs code.

Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: David Sterba <dsterba@suse.com>

diff --git a/fs/btrfs/compression.c b/fs/btrfs/compression.c
index 6ab82e1..2536754 100644 (file)
--- a/fs/btrfs/compression.c
+++ b/fs/btrfs/compression.c
@@ -760,7 +760,6 @@ static noinline int add_ra_bio_pages(struct inode *inode,
                                int zeros;
                                zeros = PAGE_SIZE - zero_offset;
                                memzero_page(page, zero_offset, zeros);
-                               flush_dcache_page(page);
                        }
                }
 
@@ -1476,7 +1475,6 @@ int btrfs_decompress_buf2page(const char *buf, u32 buf_len,
                ASSERT(copy_start - decompressed < buf_len);
                memcpy_to_page(bvec.bv_page, bvec.bv_offset,
                               buf + copy_start - decompressed, copy_len);
-               flush_dcache_page(bvec.bv_page);
                cur_offset += copy_len;
 
                bio_advance(orig_bio, copy_len);

diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c
index 62425d1..69b6b4b 100644 (file)
--- a/fs/btrfs/extent_io.c
+++ b/fs/btrfs/extent_io.c
@@ -3641,7 +3641,6 @@ static int btrfs_do_readpage(struct page *page, struct extent_map **em_cached,
                if (zero_offset) {
                        iosize = PAGE_SIZE - zero_offset;
                        memzero_page(page, zero_offset, iosize);
-                       flush_dcache_page(page);
                }
        }
        begin_page_read(fs_info, page);
@@ -3656,7 +3655,6 @@ static int btrfs_do_readpage(struct page *page, struct extent_map **em_cached,
 
                        iosize = PAGE_SIZE - pg_offset;
                        memzero_page(page, pg_offset, iosize);
-                       flush_dcache_page(page);
                        set_extent_uptodate(tree, cur, cur + iosize - 1,
                                            &cached, GFP_NOFS);
                        unlock_extent_cached(tree, cur,
@@ -3740,7 +3738,6 @@ static int btrfs_do_readpage(struct page *page, struct extent_map **em_cached,
                        struct extent_state *cached = NULL;
 
                        memzero_page(page, pg_offset, iosize);
-                       flush_dcache_page(page);
 
                        set_extent_uptodate(tree, cur, cur + iosize - 1,
                                            &cached, GFP_NOFS);
@@ -4158,10 +4155,8 @@ static int __extent_writepage(struct page *page, struct writeback_control *wbc,
                return 0;
        }
 
-       if (page->index == end_index) {
+       if (page->index == end_index)
                memzero_page(page, pg_offset, PAGE_SIZE - pg_offset);
-               flush_dcache_page(page);
-       }
 
        ret = set_page_extent_mapped(page);
        if (ret < 0) {

diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index 76e493e..f96e332 100644 (file)
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -4873,7 +4873,6 @@ again:
                else
                        memzero_page(page, (block_start - page_offset(page)) + offset,
                                     len);
-               flush_dcache_page(page);
        }
        btrfs_page_clear_checked(fs_info, page, block_start,
                                 block_end + 1 - block_start);
@@ -8598,10 +8597,9 @@ again:
        else
                zero_start = PAGE_SIZE;
 
-       if (zero_start != PAGE_SIZE) {
+       if (zero_start != PAGE_SIZE)
                memzero_page(page, zero_start, PAGE_SIZE - zero_start);
-               flush_dcache_page(page);
-       }
+
        btrfs_page_clear_checked(fs_info, page, page_start, PAGE_SIZE);
        btrfs_page_set_dirty(fs_info, page, page_start, end + 1 - page_start);
        btrfs_page_set_uptodate(fs_info, page, page_start, end + 1 - page_start);

diff --git a/fs/btrfs/reflink.c b/fs/btrfs/reflink.c
index a3549d5..e30f53b 100644 (file)
--- a/fs/btrfs/reflink.c
+++ b/fs/btrfs/reflink.c
@@ -110,7 +110,6 @@ static int copy_inline_to_page(struct btrfs_inode *inode,
        if (comp_type == BTRFS_COMPRESS_NONE) {
                memcpy_to_page(page, offset_in_page(file_offset), data_start,
                               datal);
-               flush_dcache_page(page);
        } else {
                ret = btrfs_decompress(comp_type, data_start, page,
                                       offset_in_page(file_offset),
@@ -132,10 +131,8 @@ static int copy_inline_to_page(struct btrfs_inode *inode,
         *
         * So what's in the range [500, 4095] corresponds to zeroes.
         */
-       if (datal < block_size) {
+       if (datal < block_size)
                memzero_page(page, datal, block_size - datal);
-               flush_dcache_page(page);
-       }
 
        btrfs_page_set_uptodate(fs_info, page, file_offset, block_size);
        btrfs_page_clear_checked(fs_info, page, file_offset, block_size);