mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-30 06:10:56 +00:00
Code Issues Releases Wiki Activity

btrfs: remove redundant calls to flush_dcache_page

Browse source 
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>
This commit is contained in:
David Sterba 2022-06-01 13:47:54 +02:00
parent bd8f7e6277
commit 21a8935ead
4 changed files with 4 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
fs/btrfs/compression.c
View file

@ -760,7 +760,6 @@ static noinline int add_ra_bio_pages(struct inode *inode,
int zeros; int zeros;
zeros = PAGE_SIZE - zero_offset; zeros = PAGE_SIZE - zero_offset;
memzero_page(page, zero_offset, zeros); 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); ASSERT(copy_start - decompressed < buf_len);
memcpy_to_page(bvec.bv_page, bvec.bv_offset, memcpy_to_page(bvec.bv_page, bvec.bv_offset,
buf + copy_start - decompressed, copy_len); buf + copy_start - decompressed, copy_len);
flush_dcache_page(bvec.bv_page);
cur_offset += copy_len; cur_offset += copy_len;
bio_advance(orig_bio, copy_len); bio_advance(orig_bio, copy_len);

7
fs/btrfs/extent_io.c
View file

@ -3641,7 +3641,6 @@ static int btrfs_do_readpage(struct page *page, struct extent_map **em_cached,
if (zero_offset) { if (zero_offset) {
iosize = PAGE_SIZE - zero_offset; iosize = PAGE_SIZE - zero_offset;
memzero_page(page, zero_offset, iosize); memzero_page(page, zero_offset, iosize);
flush_dcache_page(page);
} }
} }
begin_page_read(fs_info, 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; iosize = PAGE_SIZE - pg_offset;
memzero_page(page, pg_offset, iosize); memzero_page(page, pg_offset, iosize);
flush_dcache_page(page);
set_extent_uptodate(tree, cur, cur + iosize - 1, set_extent_uptodate(tree, cur, cur + iosize - 1,
&cached, GFP_NOFS); &cached, GFP_NOFS);
unlock_extent_cached(tree, cur, 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; struct extent_state *cached = NULL;
memzero_page(page, pg_offset, iosize); memzero_page(page, pg_offset, iosize);
flush_dcache_page(page);
set_extent_uptodate(tree, cur, cur + iosize - 1, set_extent_uptodate(tree, cur, cur + iosize - 1,
&cached, GFP_NOFS); &cached, GFP_NOFS);
@ -4158,10 +4155,8 @@ static int __extent_writepage(struct page *page, struct writeback_control *wbc,
return 0; return 0;
} }
if (page->index == end_index) { if (page->index == end_index)
memzero_page(page, pg_offset, PAGE_SIZE - pg_offset); memzero_page(page, pg_offset, PAGE_SIZE - pg_offset);
flush_dcache_page(page);
}
ret = set_page_extent_mapped(page); ret = set_page_extent_mapped(page);
if (ret < 0) { if (ret < 0) {

6
fs/btrfs/inode.c
View file

@ -4873,7 +4873,6 @@ int btrfs_truncate_block(struct btrfs_inode *inode, loff_t from, loff_t len,
else else
memzero_page(page, (block_start - page_offset(page)) + offset, memzero_page(page, (block_start - page_offset(page)) + offset,
len); len);
flush_dcache_page(page);
} }
btrfs_page_clear_checked(fs_info, page, block_start, btrfs_page_clear_checked(fs_info, page, block_start,
block_end + 1 - block_start); block_end + 1 - block_start);
@ -8598,10 +8597,9 @@ vm_fault_t btrfs_page_mkwrite(struct vm_fault *vmf)
else else
zero_start = PAGE_SIZE; zero_start = PAGE_SIZE;
if (zero_start != PAGE_SIZE) { if (zero_start != PAGE_SIZE)
memzero_page(page, zero_start, PAGE_SIZE - zero_start); 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_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_dirty(fs_info, page, page_start, end + 1 - page_start);
btrfs_page_set_uptodate(fs_info, page, page_start, end + 1 - page_start); btrfs_page_set_uptodate(fs_info, page, page_start, end + 1 - page_start);

5
fs/btrfs/reflink.c
View file

@ -110,7 +110,6 @@ static int copy_inline_to_page(struct btrfs_inode *inode,
if (comp_type == BTRFS_COMPRESS_NONE) { if (comp_type == BTRFS_COMPRESS_NONE) {
memcpy_to_page(page, offset_in_page(file_offset), data_start, memcpy_to_page(page, offset_in_page(file_offset), data_start,
datal); datal);
flush_dcache_page(page);
} else { } else {
ret = btrfs_decompress(comp_type, data_start, page, ret = btrfs_decompress(comp_type, data_start, page,
offset_in_page(file_offset), 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. * 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); memzero_page(page, datal, block_size - datal);
flush_dcache_page(page);
}
btrfs_page_set_uptodate(fs_info, page, file_offset, block_size); btrfs_page_set_uptodate(fs_info, page, file_offset, block_size);
btrfs_page_clear_checked(fs_info, page, file_offset, block_size); btrfs_page_clear_checked(fs_info, page, file_offset, block_size);