* [PATCH] f2fs: fix missing clear FI_NO_PREALLOC in some error case
@ 2018-04-23 3:36 Yunlei He
2018-04-23 8:38 ` Chao Yu
0 siblings, 1 reply; 2+ messages in thread
From: Yunlei He @ 2018-04-23 3:36 UTC (permalink / raw)
To: jaegeuk, yuchao0, linux-f2fs-devel; +Cc: zhangdianfang
This patch clean f2fs_file_write_iter to avoid missing clear
FI_NO_PREALLOC in some error case.
Signed-off-by: Yunlei He <heyunlei@huawei.com>
---
fs/f2fs/file.c | 35 ++++++++++++++++-------------------
1 file changed, 16 insertions(+), 19 deletions(-)
diff --git a/fs/f2fs/file.c b/fs/f2fs/file.c
index 16dad2b..c7dff0b 100644
--- a/fs/f2fs/file.c
+++ b/fs/f2fs/file.c
@@ -2894,12 +2894,13 @@ static ssize_t f2fs_file_write_iter(struct kiocb *iocb, struct iov_iter *from)
{
struct file *file = iocb->ki_filp;
struct inode *inode = file_inode(file);
+ int o_direct = iocb->ki_flags & IOCB_DIRECT;
ssize_t ret;
if (unlikely(f2fs_cp_error(F2FS_I_SB(inode))))
return -EIO;
- if ((iocb->ki_flags & IOCB_NOWAIT) && !(iocb->ki_flags & IOCB_DIRECT))
+ if ((iocb->ki_flags & IOCB_NOWAIT) && !o_direct)
return -EINVAL;
if (!inode_trylock(inode)) {
@@ -2910,44 +2911,40 @@ static ssize_t f2fs_file_write_iter(struct kiocb *iocb, struct iov_iter *from)
ret = generic_write_checks(iocb, from);
if (ret > 0) {
- bool preallocated = false;
size_t target_size = 0;
- int err;
- if (iov_iter_fault_in_readable(from, iov_iter_count(from)))
- set_inode_flag(inode, FI_NO_PREALLOC);
-
- if ((iocb->ki_flags & IOCB_NOWAIT) &&
- (iocb->ki_flags & IOCB_DIRECT)) {
+ if ((iocb->ki_flags & IOCB_NOWAIT) && o_direct) {
if (!f2fs_overwrite_io(inode, iocb->ki_pos,
iov_iter_count(from)) ||
f2fs_has_inline_data(inode) ||
f2fs_force_buffered_io(inode, WRITE)) {
- inode_unlock(inode);
- return -EAGAIN;
+ ret = -EAGAIN;
+ goto out;
}
} else {
- preallocated = true;
+ if (iov_iter_fault_in_readable(from, iov_iter_count(from)))
+ set_inode_flag(inode, FI_NO_PREALLOC);
+
target_size = iocb->ki_pos + iov_iter_count(from);
- err = f2fs_preallocate_blocks(iocb, from);
- if (err) {
- clear_inode_flag(inode, FI_NO_PREALLOC);
- inode_unlock(inode);
- return err;
- }
+ ret = f2fs_preallocate_blocks(iocb, from);
+ if (ret)
+ goto out;
}
ret = __generic_file_write_iter(iocb, from);
- clear_inode_flag(inode, FI_NO_PREALLOC);
/* if we couldn't write data, we should deallocate blocks. */
- if (preallocated && i_size_read(inode) < target_size)
+ if (!is_inode_flag_set(inode, FI_NO_PREALLOC) &&
+ i_size_read(inode) < target_size)
f2fs_truncate(inode);
if (ret > 0)
f2fs_update_iostat(F2FS_I_SB(inode), APP_WRITE_IO, ret);
}
+
+out:
+ clear_inode_flag(inode, FI_NO_PREALLOC);
inode_unlock(inode);
if (ret > 0)
--
1.9.1
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] f2fs: fix missing clear FI_NO_PREALLOC in some error case
2018-04-23 3:36 [PATCH] f2fs: fix missing clear FI_NO_PREALLOC in some error case Yunlei He
@ 2018-04-23 8:38 ` Chao Yu
0 siblings, 0 replies; 2+ messages in thread
From: Chao Yu @ 2018-04-23 8:38 UTC (permalink / raw)
To: Yunlei He, jaegeuk, linux-f2fs-devel; +Cc: zhangdianfang
On 2018/4/23 11:36, Yunlei He wrote:
> This patch clean f2fs_file_write_iter to avoid missing clear
> FI_NO_PREALLOC in some error case.
>
> Signed-off-by: Yunlei He <heyunlei@huawei.com>
> ---
> fs/f2fs/file.c | 35 ++++++++++++++++-------------------
> 1 file changed, 16 insertions(+), 19 deletions(-)
>
> diff --git a/fs/f2fs/file.c b/fs/f2fs/file.c
> index 16dad2b..c7dff0b 100644
> --- a/fs/f2fs/file.c
> +++ b/fs/f2fs/file.c
> @@ -2894,12 +2894,13 @@ static ssize_t f2fs_file_write_iter(struct kiocb *iocb, struct iov_iter *from)
> {
> struct file *file = iocb->ki_filp;
> struct inode *inode = file_inode(file);
> + int o_direct = iocb->ki_flags & IOCB_DIRECT;
> ssize_t ret;
>
> if (unlikely(f2fs_cp_error(F2FS_I_SB(inode))))
> return -EIO;
>
> - if ((iocb->ki_flags & IOCB_NOWAIT) && !(iocb->ki_flags & IOCB_DIRECT))
> + if ((iocb->ki_flags & IOCB_NOWAIT) && !o_direct)
> return -EINVAL;
>
> if (!inode_trylock(inode)) {
> @@ -2910,44 +2911,40 @@ static ssize_t f2fs_file_write_iter(struct kiocb *iocb, struct iov_iter *from)
>
> ret = generic_write_checks(iocb, from);
> if (ret > 0) {
> - bool preallocated = false;
> size_t target_size = 0;
> - int err;
>
> - if (iov_iter_fault_in_readable(from, iov_iter_count(from)))
> - set_inode_flag(inode, FI_NO_PREALLOC);
> -
> - if ((iocb->ki_flags & IOCB_NOWAIT) &&
> - (iocb->ki_flags & IOCB_DIRECT)) {
> + if ((iocb->ki_flags & IOCB_NOWAIT) && o_direct) {
> if (!f2fs_overwrite_io(inode, iocb->ki_pos,
> iov_iter_count(from)) ||
> f2fs_has_inline_data(inode) ||
> f2fs_force_buffered_io(inode, WRITE)) {
Just add clear_inode_flag(inode, FI_NO_PREALLOC) here is OK?
Thanks,
> - inode_unlock(inode);
> - return -EAGAIN;
> + ret = -EAGAIN;
> + goto out;
> }
>
> } else {
> - preallocated = true;
> + if (iov_iter_fault_in_readable(from, iov_iter_count(from)))
> + set_inode_flag(inode, FI_NO_PREALLOC);
> +
> target_size = iocb->ki_pos + iov_iter_count(from);
>
> - err = f2fs_preallocate_blocks(iocb, from);
> - if (err) {
> - clear_inode_flag(inode, FI_NO_PREALLOC);
> - inode_unlock(inode);
> - return err;
> - }
> + ret = f2fs_preallocate_blocks(iocb, from);
> + if (ret)
> + goto out;
> }
> ret = __generic_file_write_iter(iocb, from);
> - clear_inode_flag(inode, FI_NO_PREALLOC);
>
> /* if we couldn't write data, we should deallocate blocks. */
> - if (preallocated && i_size_read(inode) < target_size)
> + if (!is_inode_flag_set(inode, FI_NO_PREALLOC) &&
> + i_size_read(inode) < target_size)
> f2fs_truncate(inode);
>
> if (ret > 0)
> f2fs_update_iostat(F2FS_I_SB(inode), APP_WRITE_IO, ret);
> }
> +
> +out:
> + clear_inode_flag(inode, FI_NO_PREALLOC);
> inode_unlock(inode);
>
> if (ret > 0)
>
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2018-04-23 8:38 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-04-23 3:36 [PATCH] f2fs: fix missing clear FI_NO_PREALLOC in some error case Yunlei He
2018-04-23 8:38 ` Chao Yu
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.