f2fs: avoid stat_inc_atomic_write for non-atomic file
authorKinglong Mee <kinglongmee@gmail.com>
Sat, 18 Mar 2017 01:20:55 +0000 (09:20 +0800)
committerJaegeuk Kim <jaegeuk@kernel.org>
Wed, 22 Mar 2017 02:34:36 +0000 (22:34 -0400)
After filemap_write_and_wait_range fail, the FI_ATOMIC_FILE flags is removed,
so that f2fs should not increase the stat of atomic_write.

Signed-off-by: Kinglong Mee <kinglongmee@gmail.com>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
fs/f2fs/file.c

index 78ece6e..7704bd9 100644 (file)
@@ -1533,17 +1533,21 @@ static int f2fs_ioc_start_atomic_write(struct file *filp)
        f2fs_update_time(F2FS_I_SB(inode), REQ_TIME);
 
        if (!get_dirty_pages(inode))
-               goto out;
+               goto inc_stat;
 
        f2fs_msg(F2FS_I_SB(inode)->sb, KERN_WARNING,
                "Unexpected flush for atomic writes: ino=%lu, npages=%u",
                                        inode->i_ino, get_dirty_pages(inode));
        ret = filemap_write_and_wait_range(inode->i_mapping, 0, LLONG_MAX);
-       if (ret)
+       if (ret) {
                clear_inode_flag(inode, FI_ATOMIC_FILE);
-out:
+               goto out;
+       }
+
+inc_stat:
        stat_inc_atomic_write(inode);
        stat_update_max_atomic_write(inode);
+out:
        inode_unlock(inode);
        mnt_drop_write_file(filp);
        return ret;