4 files changed, 13 insertions, 5 deletions

diff --git a/fs/f2fs/acl.c b/fs/f2fs/acl.c
index a140c5e3dc54..b4b8438c42ef 100644
--- a/fs/f2fs/acl.c
+++ b/fs/f2fs/acl.c
@@ -211,7 +211,7 @@ static int __f2fs_set_acl(struct inode *inode, int type,
         switch (type) {
         case ACL_TYPE_ACCESS:
                 name_index = F2FS_XATTR_INDEX_POSIX_ACL_ACCESS;
-                if (acl) {
+                if (acl && !ipage) {
                         error = posix_acl_update_mode(inode, &inode->i_mode, &acl);
                         if (error)
                                 return error;
diff --git a/fs/f2fs/checkpoint.c b/fs/f2fs/checkpoint.c
index 56bbf592e487..5b876f6d3f6b 100644
--- a/fs/f2fs/checkpoint.c
+++ b/fs/f2fs/checkpoint.c
@@ -879,6 +879,7 @@ int sync_dirty_inodes(struct f2fs_sb_info *sbi, enum inode_type type)
         struct inode *inode;
         struct f2fs_inode_info *fi;
         bool is_dir = (type == DIR_INODE);
+        unsigned long ino = 0;
 
         trace_f2fs_sync_dirty_inodes_enter(sbi->sb, is_dir,
                                 get_pages(sbi, is_dir ?
@@ -901,8 +902,17 @@ retry:
         inode = igrab(&fi->vfs_inode);
         spin_unlock(&sbi->inode_lock[type]);
         if (inode) {
+                unsigned long cur_ino = inode->i_ino;
+
                 filemap_fdatawrite(inode->i_mapping);
                 iput(inode);
+                /* We need to give cpu to another writers. */
+                if (ino == cur_ino) {
+                        congestion_wait(BLK_RW_ASYNC, HZ/50);
+                        cond_resched();
+                } else {
+                        ino = cur_ino;
+                }
         } else {
                 /*
                  * We should submit bio, since it exists several
diff --git a/fs/f2fs/file.c b/fs/f2fs/file.c
index a0e6d2c65a9e..2706130c261b 100644
--- a/fs/f2fs/file.c
+++ b/fs/f2fs/file.c
@@ -1538,7 +1538,6 @@ static int f2fs_ioc_setflags(struct file *filp, unsigned long arg)
 
         /* Is it quota file? Do not allow user to mess with it */
         if (IS_NOQUOTA(inode)) {
-                inode_unlock(inode);
                 ret = -EPERM;
                 goto unlock_out;
         }
@@ -1549,9 +1548,8 @@ static int f2fs_ioc_setflags(struct file *filp, unsigned long arg)
 
         if ((flags ^ oldflags) & (FS_APPEND_FL | FS_IMMUTABLE_FL)) {
                 if (!capable(CAP_LINUX_IMMUTABLE)) {
-                        inode_unlock(inode);
                         ret = -EPERM;
-                        goto out;
+                        goto unlock_out;
                 }
         }
 
@@ -1564,7 +1562,6 @@ static int f2fs_ioc_setflags(struct file *filp, unsigned long arg)
         f2fs_mark_inode_dirty_sync(inode, false);
 unlock_out:
         inode_unlock(inode);
-out:
         mnt_drop_write_file(filp);
         return ret;
 }
diff --git a/fs/f2fs/sysfs.c b/fs/f2fs/sysfs.c
index 9adc202fcd6f..71191d89917d 100644
--- a/fs/f2fs/sysfs.c
+++ b/fs/f2fs/sysfs.c
@@ -11,6 +11,7 @@
  */
 #include <linux/proc_fs.h>
 #include <linux/f2fs_fs.h>
+#include <linux/seq_file.h>
 
 #include "f2fs.h"
 #include "segment.h"