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

btrfs: unify extent_page_data type passed as void 

Functions called from extent_write_cache_pages used void* as generic
callback data, but all of them convert it to extent_page_data, or use it
directly.

Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
David Sterba 2017-11-30 18:00:02 +01:00
parent 935db8531f
commit aab6e9edf0
1 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
fs/btrfs/extent_io.c
View File

@ -138,7 +138,7 @@ static void add_extent_changeset(struct extent_state *state, unsigned bits,
BUG_ON(ret < 0); BUG_ON(ret < 0);
} }
static void flush_write_bio(void *data); static void flush_write_bio(struct extent_page_data *epd);
static inline struct btrfs_fs_info * static inline struct btrfs_fs_info *
tree_fs_info(struct extent_io_tree *tree) tree_fs_info(struct extent_io_tree *tree)
@ -3456,10 +3456,9 @@ static noinline_for_stack int __extent_writepage_io(struct inode *inode,
* and the end_io handler clears the writeback ranges * and the end_io handler clears the writeback ranges
*/ */
static int __extent_writepage(struct page *page, struct writeback_control *wbc, static int __extent_writepage(struct page *page, struct writeback_control *wbc,
void *data) struct extent_page_data *epd)
{ {
struct inode *inode = page->mapping->host; struct inode *inode = page->mapping->host;
struct extent_page_data *epd = data;
u64 start = page_offset(page); u64 start = page_offset(page);
u64 page_end = start + PAGE_SIZE - 1; u64 page_end = start + PAGE_SIZE - 1;
int ret; int ret;
@ -3905,7 +3904,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,
void *data) struct extent_page_data *epd)
{ {
struct inode *inode = mapping->host; struct inode *inode = mapping->host;
int ret = 0; int ret = 0;
@ -3969,7 +3968,7 @@ static int extent_write_cache_pages(struct address_space *mapping,
* mapping * mapping
*/ */
if (!trylock_page(page)) { if (!trylock_page(page)) {
flush_write_bio(data); flush_write_bio(epd);
lock_page(page); lock_page(page);
} }
@ -3980,7 +3979,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_write_bio(data); flush_write_bio(epd);
wait_on_page_writeback(page); wait_on_page_writeback(page);
} }
@ -3990,7 +3989,7 @@ static int extent_write_cache_pages(struct address_space *mapping,
continue; continue;
} }
ret = __extent_writepage(page, wbc, data); ret = __extent_writepage(page, wbc, epd);
if (unlikely(ret == AOP_WRITEPAGE_ACTIVATE)) { if (unlikely(ret == AOP_WRITEPAGE_ACTIVATE)) {
unlock_page(page); unlock_page(page);
@ -4038,10 +4037,8 @@ static int extent_write_cache_pages(struct address_space *mapping,
return ret; return ret;
} }
static void flush_write_bio(void *data) static void flush_write_bio(struct extent_page_data *epd)
{ {
struct extent_page_data *epd = data;
if (epd->bio) { if (epd->bio) {
int ret; int ret;