f2fs: atomic: fix to forbid dio in atomic_file
Chao Yu
maintainerPATCH v2 4/4 f2fs: atomic: fix to forbid dio in atomic_file
atomic write can only be used via buffered IO, let's fail direct IO on atomic_file and return -EOPNOTSUPP.
Signed-off-by Chao Yu <[email protected]>
---
v2:
- fix error path handling.
fs/f2fs/file.c | 36 ++++++++++++++++++++++++------------ 1 file changed, 24 insertions(+), 12 deletions(-)
fs/f2fs/file.c +24 -12
@@ -2162,6 +2162,7 @@ static int f2fs_ioc_start_atomic_write(struct file *filp, bool truncate) goto out;f2fs_down_write (&fi->i_gc_rwsem[WRITE ]); +f2fs_down_write (&fi->i_gc_rwsem[READ ]);/* * Should wait end_io to count F2FS_WB_CP_DATA correctly by
@@ -2171,10 +2172,8 @@ static int f2fs_ioc_start_atomic_write(struct file *filp, bool truncate)f2fs_warn (sbi,"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) { -f2fs_up_write (&fi->i_gc_rwsem[WRITE ]); - goto out; - } +if (ret) + goto out_unlock;/* Check if the inode already has a COW inode */ if (fi->cow_inode ==NULL ) {
@@ -2183,10 +2182,8 @@ static int f2fs_ioc_start_atomic_write(struct file *filp, bool truncate)struct inode *dir =d_inode (dentry->d_parent); ret =f2fs_get_tmpfile (idmap, dir, &fi->cow_inode); -if (ret) { -f2fs_up_write (&fi->i_gc_rwsem[WRITE ]); - goto out; - } +if (ret) + goto out_unlock;set_inode_flag (fi->cow_inode,FI_COW_FILE );clear_inode_flag (fi->cow_inode,FI_INLINE_DATA );
@@ -2200,10 +2197,8 @@ static int f2fs_ioc_start_atomic_write(struct file *filp, bool truncate)invalidate_mapping_pages (fi->cow_inode->i_mapping,0 ,-1 ); ret =f2fs_do_truncate_blocks (fi->cow_inode,0 , true); -if (ret) { -f2fs_up_write (&fi->i_gc_rwsem[WRITE ]); - goto out; - } +if (ret) + goto out_unlock; }f2fs_write_inode (inode,NULL );
@@ -2222,7 +2217,11 @@ static int f2fs_ioc_start_atomic_write(struct file *filp, bool truncate) }f2fs_i_size_write (fi->cow_inode, isize); +out_unlock: +f2fs_up_write (&fi->i_gc_rwsem[READ ]);f2fs_up_write (&fi->i_gc_rwsem[WRITE ]); +if (ret) + goto out;f2fs_update_time (sbi,REQ_TIME ); fi->atomic_write_task = current;
@@ -4567,6 +4566,13 @@ static ssize_t f2fs_dio_read_iter(struct kiocb *iocb, struct iov_iter *to)f2fs_down_read (&fi->i_gc_rwsem[READ ]); } +/* dio is not compatible w/ atomic file */ +if (f2fs_is_atomic_file (inode)) { +f2fs_up_read (&fi->i_gc_rwsem[READ ]); + ret = -EOPNOTSUPP ; + goto out; + } +/* * We have to use __iomap_dio_rw() and iomap_dio_complete() instead of * the higher-level function iomap_dio_rw() in order to ensure that the
@@ -4982,6 +4988,12 @@ static ssize_t f2fs_file_write_iter(struct kiocb *iocb, struct iov_iter *from)/* Determine whether we will do a direct write or a buffered write. */ dio =f2fs_should_use_dio (inode, iocb, from); +/* dio is not compatible w/ atomic write */ +if (dio &&f2fs_is_atomic_file (inode)) { + ret = -EOPNOTSUPP ; + goto out_unlock; + } +/* Possibly preallocate the blocks for the write. */ target_size = iocb->ki_pos +iov_iter_count (from); preallocated =f2fs_preallocate_blocks (iocb, from, dio);
Signature · 1 line
2.40.1
This patch was applied to jaegeuk/f2fs.git (dev) by Jaegeuk Kim <[email protected]>:
Hello:
This patch was applied to jaegeuk/f2fs.git (dev)
by Jaegeuk Kim <[email protected]>:
Quoted 9 lines · On Fri, 16 Aug 2024 09:13:42 +0800 you wrote:
atomic write can only be used via buffered IO, let's fail direct IO on
atomic_fileand return-EOPNOTSUPP.Signed-off-by Chao Yu <[email protected]>---
v2:
- fix error path handling.fs/f2fs/file.c | 36 ++++++++++++++++++++++++------------ 1 file changed, 24 insertions(+), 12 deletions(-)
Here is the summary with links:
- [f2fs-dev,v2,4/4] f2fs: atomic: fix to forbid dio in atomic_file
https://git.kernel.org/jaegeuk/f2fs/c/b2c160f4f3cf
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html