aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKinglong Mee <kinglongmee@gmail.com>2017-03-17 21:20:55 -0400
committerJaegeuk Kim <jaegeuk@kernel.org>2017-03-21 22:34:36 -0400
commit684ca7e55de1f3defb13c491e0b5eb8f27ffe79c (patch)
tree4ec04c19a2774f821549a7b14964802151f09627
parenta58f24495d072c5cf2177a5343dd8d751383fdc7 (diff)
f2fs: avoid stat_inc_atomic_write for non-atomic file
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>
-rw-r--r--fs/f2fs/file.c10
1 files changed, 7 insertions, 3 deletions
diff --git a/fs/f2fs/file.c b/fs/f2fs/file.c
index 78ece6e4779c..7704bd99b990 100644
--- a/fs/f2fs/file.c
+++ b/fs/f2fs/file.c
@@ -1533,17 +1533,21 @@ static int f2fs_ioc_start_atomic_write(struct file *filp)
1533 f2fs_update_time(F2FS_I_SB(inode), REQ_TIME); 1533 f2fs_update_time(F2FS_I_SB(inode), REQ_TIME);
1534 1534
1535 if (!get_dirty_pages(inode)) 1535 if (!get_dirty_pages(inode))
1536 goto out; 1536 goto inc_stat;
1537 1537
1538 f2fs_msg(F2FS_I_SB(inode)->sb, KERN_WARNING, 1538 f2fs_msg(F2FS_I_SB(inode)->sb, KERN_WARNING,
1539 "Unexpected flush for atomic writes: ino=%lu, npages=%u", 1539 "Unexpected flush for atomic writes: ino=%lu, npages=%u",
1540 inode->i_ino, get_dirty_pages(inode)); 1540 inode->i_ino, get_dirty_pages(inode));
1541 ret = filemap_write_and_wait_range(inode->i_mapping, 0, LLONG_MAX); 1541 ret = filemap_write_and_wait_range(inode->i_mapping, 0, LLONG_MAX);
1542 if (ret) 1542 if (ret) {
1543 clear_inode_flag(inode, FI_ATOMIC_FILE); 1543 clear_inode_flag(inode, FI_ATOMIC_FILE);
1544out: 1544 goto out;
1545 }
1546
1547inc_stat:
1545 stat_inc_atomic_write(inode); 1548 stat_inc_atomic_write(inode);
1546 stat_update_max_atomic_write(inode); 1549 stat_update_max_atomic_write(inode);
1550out:
1547 inode_unlock(inode); 1551 inode_unlock(inode);
1548 mnt_drop_write_file(filp); 1552 mnt_drop_write_file(filp);
1549 return ret; 1553 return ret;