f2fs: increase pages_skipped when skipping writepages
This patch increases pages_skipped when skipping writepages. Signed-off-by: Jaegeuk Kim <jaegeuk.kim@samsung.com>
This commit is contained in:
Родитель
87d6f89094
Коммит
d3baf95da5
|
@ -190,12 +190,9 @@ static int f2fs_write_meta_pages(struct address_space *mapping,
|
|||
int nrpages = nr_pages_to_skip(sbi, META);
|
||||
long written;
|
||||
|
||||
if (wbc->for_kupdate)
|
||||
return 0;
|
||||
|
||||
/* collect a number of dirty meta pages and write together */
|
||||
if (get_pages(sbi, F2FS_DIRTY_META) < nrpages)
|
||||
return 0;
|
||||
if (wbc->for_kupdate || get_pages(sbi, F2FS_DIRTY_META) < nrpages)
|
||||
goto skip_write;
|
||||
|
||||
/* if mounting is failed, skip writing node pages */
|
||||
mutex_lock(&sbi->cp_mutex);
|
||||
|
@ -203,6 +200,10 @@ static int f2fs_write_meta_pages(struct address_space *mapping,
|
|||
mutex_unlock(&sbi->cp_mutex);
|
||||
wbc->nr_to_write -= written;
|
||||
return 0;
|
||||
|
||||
skip_write:
|
||||
wbc->pages_skipped += get_pages(sbi, F2FS_DIRTY_META);
|
||||
return 0;
|
||||
}
|
||||
|
||||
long sync_meta_pages(struct f2fs_sb_info *sbi, enum page_type type,
|
||||
|
|
|
@ -870,7 +870,7 @@ static int f2fs_write_data_pages(struct address_space *mapping,
|
|||
|
||||
if (S_ISDIR(inode->i_mode) && wbc->sync_mode == WB_SYNC_NONE &&
|
||||
get_dirty_dents(inode) < nr_pages_to_skip(sbi, DATA))
|
||||
return 0;
|
||||
goto skip_write;
|
||||
|
||||
if (wbc->nr_to_write < MAX_DESIRED_PAGES_WP) {
|
||||
desired_nrtw = MAX_DESIRED_PAGES_WP;
|
||||
|
@ -892,6 +892,10 @@ static int f2fs_write_data_pages(struct address_space *mapping,
|
|||
|
||||
wbc->nr_to_write -= excess_nrtw;
|
||||
return ret;
|
||||
|
||||
skip_write:
|
||||
wbc->pages_skipped += get_dirty_dents(inode);
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int f2fs_write_begin(struct file *file, struct address_space *mapping,
|
||||
|
|
|
@ -1209,7 +1209,7 @@ static int f2fs_write_node_pages(struct address_space *mapping,
|
|||
|
||||
/* collect a number of dirty node pages and write together */
|
||||
if (get_pages(sbi, F2FS_DIRTY_NODES) < nr_pages_to_skip(sbi, NODE))
|
||||
return 0;
|
||||
goto skip_write;
|
||||
|
||||
/* if mounting is failed, skip writing node pages */
|
||||
wbc->nr_to_write = 3 * max_hw_blocks(sbi);
|
||||
|
@ -1218,6 +1218,10 @@ static int f2fs_write_node_pages(struct address_space *mapping,
|
|||
wbc->nr_to_write = nr_to_write - (3 * max_hw_blocks(sbi) -
|
||||
wbc->nr_to_write);
|
||||
return 0;
|
||||
|
||||
skip_write:
|
||||
wbc->pages_skipped += get_pages(sbi, F2FS_DIRTY_NODES);
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int f2fs_set_node_page_dirty(struct page *page)
|
||||
|
|
Загрузка…
Ссылка в новой задаче