From: Jaegeuk Kim Date: Thu, 2 Jun 2016 03:55:51 +0000 (-0700) Subject: Revert "f2fs: no need inc dirty pages under inode lock" X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=1c4bf763039ccdc6dab9e1c3cf84a1cb14c6ff13;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git Revert "f2fs: no need inc dirty pages under inode lock" This reverts commit b951a4ec165af4973b2bd9c80fb5845fbd840435. Conflicts: fs/f2fs/checkpoint.c --- diff --git a/fs/f2fs/checkpoint.c b/fs/f2fs/checkpoint.c index 389160049993..5cf7238f4f89 100644 --- a/fs/f2fs/checkpoint.c +++ b/fs/f2fs/checkpoint.c @@ -793,13 +793,12 @@ void update_dirty_page(struct inode *inode, struct page *page) !S_ISLNK(inode->i_mode)) return; - if (type != FILE_INODE || test_opt(sbi, DATA_FLUSH)) { - spin_lock(&sbi->inode_lock[type]); + spin_lock(&sbi->inode_lock[type]); + if (type != FILE_INODE || test_opt(sbi, DATA_FLUSH)) __add_dirty_inode(inode, type); - spin_unlock(&sbi->inode_lock[type]); - } - inode_inc_dirty_pages(inode); + spin_unlock(&sbi->inode_lock[type]); + SetPagePrivate(page); f2fs_trace_pid(page); }