Merge branch 'stable/for-jens-3.14' of git://git.kernel.org/pub/scm/linux/kernel...

[~andy/linux] / fs / f2fs / gc.c

diff --git a/fs/f2fs/gc.c b/fs/f2fs/gc.c
index 599f546d042c556acba706ba93e69cf241bc5025..ea0371e854b4e0244537cf3d33f5f17e147e8a25 100644 (file)
--- a/fs/f2fs/gc.c
+++ b/fs/f2fs/gc.c
@@ -163,8 +163,8 @@ static void select_policy(struct f2fs_sb_info *sbi, int gc_type,
                p->ofs_unit = sbi->segs_per_sec;
        }
 
-       if (p->max_search > MAX_VICTIM_SEARCH)
-               p->max_search = MAX_VICTIM_SEARCH;
+       if (p->max_search > sbi->max_victim_search)
+               p->max_search = sbi->max_victim_search;
 
        p->offset = sbi->last_victim[p->gc_mode];
 }
@@ -428,7 +428,7 @@ next_step:
 
                /* set page dirty and write it */
                if (gc_type == FG_GC) {
-                       f2fs_wait_on_page_writeback(node_page, NODE, true);
+                       f2fs_wait_on_page_writeback(node_page, NODE);
                        set_page_dirty(node_page);
                } else {
                        if (!PageWriteback(node_page))
@@ -533,7 +533,7 @@ static void move_data_page(struct inode *inode, struct page *page, int gc_type)
        } else {
                struct f2fs_sb_info *sbi = F2FS_SB(inode->i_sb);
 
-               f2fs_wait_on_page_writeback(page, DATA, true);
+               f2fs_wait_on_page_writeback(page, DATA);
 
                if (clear_page_dirty_for_io(page) &&
                        S_ISDIR(inode->i_mode)) {