| Message ID | 20230302095509.53720-1-frank.li@vivo.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | d15180a8d1d72c7bddcb700d2c9ffdab7d2b9481 |
| Headers | show |
| Series | [f2fs-dev] f2fs: fix to handle filemap_fdatawrite() error in f2fs_ioc_decompress_file/f2fs_ioc_compress_file | expand |
Hello: This patch was applied to jaegeuk/f2fs.git (dev) by Jaegeuk Kim <jaegeuk@kernel.org>: On Thu, 2 Mar 2023 17:55:09 +0800 you wrote: > It seems inappropriate that the current logic does not handle > filemap_fdatawrite() errors, so let's fix it. > > Signed-off-by: Yangtao Li <frank.li@vivo.com> > --- > fs/f2fs/file.c | 14 ++++++++++---- > 1 file changed, 10 insertions(+), 4 deletions(-) Here is the summary with links: - [f2fs-dev] f2fs: fix to handle filemap_fdatawrite() error in f2fs_ioc_decompress_file/f2fs_ioc_compress_file https://git.kernel.org/jaegeuk/f2fs/c/d15180a8d1d7 You are awesome, thank you!
On 2023/3/2 17:55, Yangtao Li wrote: > It seems inappropriate that the current logic does not handle > filemap_fdatawrite() errors, so let's fix it. > > Signed-off-by: Yangtao Li <frank.li@vivo.com> Reviewed-by: Chao Yu <chao@kernel.org> Thanks,
diff --git a/fs/f2fs/file.c b/fs/f2fs/file.c index 15dabeac4690..6de2f27c4eec 100644 --- a/fs/f2fs/file.c +++ b/fs/f2fs/file.c @@ -4062,8 +4062,11 @@ static int f2fs_ioc_decompress_file(struct file *filp) if (ret < 0) break; - if (get_dirty_pages(inode) >= blk_per_seg) - filemap_fdatawrite(inode->i_mapping); + if (get_dirty_pages(inode) >= blk_per_seg) { + ret = filemap_fdatawrite(inode->i_mapping); + if (ret < 0) + break; + } count -= len; page_idx += len; @@ -4133,8 +4136,11 @@ static int f2fs_ioc_compress_file(struct file *filp) if (ret < 0) break; - if (get_dirty_pages(inode) >= blk_per_seg) - filemap_fdatawrite(inode->i_mapping); + if (get_dirty_pages(inode) >= blk_per_seg) { + ret = filemap_fdatawrite(inode->i_mapping); + if (ret < 0) + break; + } count -= len; page_idx += len;
It seems inappropriate that the current logic does not handle filemap_fdatawrite() errors, so let's fix it. Signed-off-by: Yangtao Li <frank.li@vivo.com> --- fs/f2fs/file.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-)