diff options
| author | Kinglong Mee <kinglongmee@gmail.com> | 2017-03-18 09:20:55 +0800 |
|---|---|---|
| committer | Moyster <oysterized@gmail.com> | 2017-05-21 18:38:45 +0200 |
| commit | 7cd858c2551ede31d82d2356b466f5b5cdf9396d (patch) | |
| tree | 54d2040519b7d3b0a707d211a3b11668189d1d1f | |
| parent | 851ed22ea79934ce8ca1d45511da40cbea0d931e (diff) | |
| download | android_kernel_m2note-7cd858c2551ede31d82d2356b466f5b5cdf9396d.tar.gz | |
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.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/fs/f2fs/file.c b/fs/f2fs/file.c index 886cca7e2..4e2376698 100644 --- a/fs/f2fs/file.c +++ b/fs/f2fs/file.c @@ -1565,17 +1565,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; |