1 files changed, 23 insertions, 13 deletions

diff --git a/fs/f2fs/file.c b/fs/f2fs/file.c
index 1edc86e874e3..78e65288f2b2 100644
--- a/fs/f2fs/file.c
+++ b/fs/f2fs/file.c
@@ -20,6 +20,7 @@
 #include <linux/uaccess.h>
 #include <linux/mount.h>
 #include <linux/pagevec.h>
+#include <linux/uio.h>
 #include <linux/uuid.h>
 #include <linux/file.h>
 
@@ -140,8 +141,6 @@ static inline bool need_do_checkpoint(struct inode *inode)
                 need_cp = true;
         else if (!is_checkpointed_node(sbi, F2FS_I(inode)->i_pino))
                 need_cp = true;
-        else if (F2FS_I(inode)->xattr_ver == cur_cp_version(F2FS_CKPT(sbi)))
-                need_cp = true;
         else if (test_opt(sbi, FASTBOOT))
                 need_cp = true;
         else if (sbi->active_logs == 2)
@@ -167,7 +166,6 @@ static void try_to_fix_pino(struct inode *inode)
         nid_t pino;
 
         down_write(&fi->i_sem);
-        fi->xattr_ver = 0;
         if (file_wrong_pino(inode) && inode->i_nlink == 1 &&
                         get_parent_ino(inode, &pino)) {
                 f2fs_i_pino_write(inode, pino);
@@ -276,7 +274,8 @@ sync_nodes:
 flush_out:
         remove_ino_entry(sbi, ino, UPDATE_INO);
         clear_inode_flag(inode, FI_UPDATE_WRITE);
-        ret = f2fs_issue_flush(sbi);
+        if (!atomic)
+                ret = f2fs_issue_flush(sbi);
         f2fs_update_time(sbi, REQ_TIME);
 out:
         trace_f2fs_sync_file_exit(inode, need_cp, datasync, ret);
@@ -567,8 +566,9 @@ int truncate_blocks(struct inode *inode, u64 from, bool lock)
         }
 
         if (f2fs_has_inline_data(inode)) {
-                if (truncate_inline_inode(ipage, from))
-                        set_page_dirty(ipage);
+                truncate_inline_inode(ipage, from);
+                if (from == 0)
+                        clear_inode_flag(inode, FI_DATA_EXIST);
                 f2fs_put_page(ipage, 1);
                 truncate_page = true;
                 goto out;
@@ -1541,6 +1541,8 @@ static int f2fs_ioc_start_atomic_write(struct file *filp)
         if (ret)
                 clear_inode_flag(inode, FI_ATOMIC_FILE);
 out:
+        stat_inc_atomic_write(inode);
+        stat_update_max_atomic_write(inode);
         inode_unlock(inode);
         mnt_drop_write_file(filp);
         return ret;
@@ -1564,15 +1566,18 @@ static int f2fs_ioc_commit_atomic_write(struct file *filp)
                 goto err_out;
 
         if (f2fs_is_atomic_file(inode)) {
-                clear_inode_flag(inode, FI_ATOMIC_FILE);
                 ret = commit_inmem_pages(inode);
-                if (ret) {
-                        set_inode_flag(inode, FI_ATOMIC_FILE);
+                if (ret)
                         goto err_out;
+
+                ret = f2fs_do_sync_file(filp, 0, LLONG_MAX, 0, true);
+                if (!ret) {
+                        clear_inode_flag(inode, FI_ATOMIC_FILE);
+                        stat_dec_atomic_write(inode);
                 }
+        } else {
+                ret = f2fs_do_sync_file(filp, 0, LLONG_MAX, 0, true);
         }
-
-        ret = f2fs_do_sync_file(filp, 0, LLONG_MAX, 0, true);
 err_out:
         inode_unlock(inode);
         mnt_drop_write_file(filp);
@@ -1870,7 +1875,7 @@ static int f2fs_defragment_range(struct f2fs_sb_info *sbi,
 {
         struct inode *inode = file_inode(filp);
         struct f2fs_map_blocks map = { .m_next_pgofs = NULL };
-        struct extent_info ei;
+        struct extent_info ei = {0,0,0};
         pgoff_t pg_start, pg_end;
         unsigned int blk_per_seg = sbi->blocks_per_seg;
         unsigned int total = 0, sec_num;
@@ -2250,8 +2255,12 @@ static ssize_t f2fs_file_write_iter(struct kiocb *iocb, struct iov_iter *from)
         inode_lock(inode);
         ret = generic_write_checks(iocb, from);
         if (ret > 0) {
-                int err = f2fs_preallocate_blocks(iocb, from);
+                int err;
+
+                if (iov_iter_fault_in_readable(from, iov_iter_count(from)))
+                        set_inode_flag(inode, FI_NO_PREALLOC);
 
+                err = f2fs_preallocate_blocks(iocb, from);
                 if (err) {
                         inode_unlock(inode);
                         return err;
@@ -2259,6 +2268,7 @@ static ssize_t f2fs_file_write_iter(struct kiocb *iocb, struct iov_iter *from)
                 blk_start_plug(&plug);
                 ret = __generic_file_write_iter(iocb, from);
                 blk_finish_plug(&plug);
+                clear_inode_flag(inode, FI_NO_PREALLOC);
         }
         inode_unlock(inode);