openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

btrfs: sink flush_fn to extent_write_cache_pages 

All callers pass the same value flush_write_bio.

Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
David Sterba 2017-06-23 04:30:28 +02:00
parent e2932ee08e
commit 25b860e038
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
fs/btrfs/extent_io.c
View File

@ -3906,8 +3906,7 @@ int btree_write_cache_pages(struct address_space *mapping,
*/ */
static int extent_write_cache_pages(struct address_space *mapping, static int extent_write_cache_pages(struct address_space *mapping,
struct writeback_control *wbc, struct writeback_control *wbc,
writepage_t writepage, void *data, writepage_t writepage, void *data)
void (*flush_fn)(void *))
{ {
struct inode *inode = mapping->host; struct inode *inode = mapping->host;
int ret = 0; int ret = 0;
@ -3971,7 +3970,7 @@ static int extent_write_cache_pages(struct address_space *mapping,
* mapping * mapping
*/ */
if (!trylock_page(page)) { if (!trylock_page(page)) {
flush_fn(data); flush_write_bio(data);
lock_page(page); lock_page(page);
} }
@ -3982,7 +3981,7 @@ static int extent_write_cache_pages(struct address_space *mapping,
if (wbc->sync_mode != WB_SYNC_NONE) { if (wbc->sync_mode != WB_SYNC_NONE) {
if (PageWriteback(page)) if (PageWriteback(page))
flush_fn(data); flush_write_bio(data);
wait_on_page_writeback(page); wait_on_page_writeback(page);
} }
@ -4123,8 +4122,7 @@ int extent_writepages(struct extent_io_tree *tree,
.sync_io = wbc->sync_mode == WB_SYNC_ALL, .sync_io = wbc->sync_mode == WB_SYNC_ALL,
}; };
ret = extent_write_cache_pages(mapping, wbc, __extent_writepage, &epd, ret = extent_write_cache_pages(mapping, wbc, __extent_writepage, &epd);
flush_write_bio);
flush_write_bio(&epd); flush_write_bio(&epd);
return ret; return ret;
} }