From: Jaegeuk Kim <jaegeuk@kernel.org> To: linux-kernel@vger.kernel.org, linux-f2fs-devel@lists.sourceforge.net Cc: Eric Biggers <ebiggers@google.com>, Jaegeuk Kim <jaegeuk@kernel.org> Subject: [PATCH 3/6] f2fs: reduce indentation in f2fs_file_write_iter() Date: Tue, 16 Nov 2021 13:45:07 -0800 [thread overview] Message-ID: <20211116214510.2934905-3-jaegeuk@kernel.org> (raw) In-Reply-To: <20211116214510.2934905-1-jaegeuk@kernel.org> From: Eric Biggers <ebiggers@google.com> Replace 'if (ret > 0)' with 'if (ret <= 0) goto out_unlock;'. No change in behavior. Signed-off-by: Eric Biggers <ebiggers@google.com> Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org> --- fs/f2fs/file.c | 69 ++++++++++++++++++++++++++------------------------ 1 file changed, 36 insertions(+), 33 deletions(-) diff --git a/fs/f2fs/file.c b/fs/f2fs/file.c index ec8de0662437..fdc440d212c3 100644 --- a/fs/f2fs/file.c +++ b/fs/f2fs/file.c @@ -4355,48 +4355,51 @@ static ssize_t f2fs_file_write_iter(struct kiocb *iocb, struct iov_iter *from) } ret = generic_write_checks(iocb, from); - if (ret > 0) { - if (iocb->ki_flags & IOCB_NOWAIT) { - if (!f2fs_overwrite_io(inode, iocb->ki_pos, - iov_iter_count(from)) || + if (ret <= 0) + goto out_unlock; + + if (iocb->ki_flags & IOCB_NOWAIT) { + if (!f2fs_overwrite_io(inode, iocb->ki_pos, + iov_iter_count(from)) || f2fs_has_inline_data(inode) || f2fs_force_buffered_io(inode, iocb, from)) { - ret = -EAGAIN; - goto out_unlock; - } - } - if (iocb->ki_flags & IOCB_DIRECT) { - ret = f2fs_convert_inline_inode(inode); - if (ret) - 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); - if (preallocated < 0) { - ret = preallocated; + ret = -EAGAIN; goto out_unlock; } + } - ret = __generic_file_write_iter(iocb, from); + if (iocb->ki_flags & IOCB_DIRECT) { + ret = f2fs_convert_inline_inode(inode); + if (ret) + 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); + if (preallocated < 0) { + ret = preallocated; + goto out_unlock; + } - /* Don't leave any preallocated blocks around past i_size. */ - if (preallocated > 0 && i_size_read(inode) < target_size) { - down_write(&F2FS_I(inode)->i_gc_rwsem[WRITE]); - filemap_invalidate_lock(inode->i_mapping); - if (!f2fs_truncate(inode)) - file_dont_truncate(inode); - filemap_invalidate_unlock(inode->i_mapping); - up_write(&F2FS_I(inode)->i_gc_rwsem[WRITE]); - } else { + ret = __generic_file_write_iter(iocb, from); + + /* Don't leave any preallocated blocks around past i_size. */ + if (preallocated > 0 && i_size_read(inode) < target_size) { + down_write(&F2FS_I(inode)->i_gc_rwsem[WRITE]); + filemap_invalidate_lock(inode->i_mapping); + if (!f2fs_truncate(inode)) file_dont_truncate(inode); - } + filemap_invalidate_unlock(inode->i_mapping); + up_write(&F2FS_I(inode)->i_gc_rwsem[WRITE]); + } else { + file_dont_truncate(inode); + } - clear_inode_flag(inode, FI_PREALLOCATED_ALL); + clear_inode_flag(inode, FI_PREALLOCATED_ALL); + + if (ret > 0) + f2fs_update_iostat(F2FS_I_SB(inode), APP_WRITE_IO, ret); - if (ret > 0) - f2fs_update_iostat(F2FS_I_SB(inode), APP_WRITE_IO, ret); - } out_unlock: inode_unlock(inode); out: -- 2.34.0.rc1.387.gb447b232ab-goog
WARNING: multiple messages have this Message-ID (diff)
From: Jaegeuk Kim <jaegeuk@kernel.org> To: linux-kernel@vger.kernel.org, linux-f2fs-devel@lists.sourceforge.net Cc: Jaegeuk Kim <jaegeuk@kernel.org>, Eric Biggers <ebiggers@google.com> Subject: [f2fs-dev] [PATCH 3/6] f2fs: reduce indentation in f2fs_file_write_iter() Date: Tue, 16 Nov 2021 13:45:07 -0800 [thread overview] Message-ID: <20211116214510.2934905-3-jaegeuk@kernel.org> (raw) In-Reply-To: <20211116214510.2934905-1-jaegeuk@kernel.org> From: Eric Biggers <ebiggers@google.com> Replace 'if (ret > 0)' with 'if (ret <= 0) goto out_unlock;'. No change in behavior. Signed-off-by: Eric Biggers <ebiggers@google.com> Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org> --- fs/f2fs/file.c | 69 ++++++++++++++++++++++++++------------------------ 1 file changed, 36 insertions(+), 33 deletions(-) diff --git a/fs/f2fs/file.c b/fs/f2fs/file.c index ec8de0662437..fdc440d212c3 100644 --- a/fs/f2fs/file.c +++ b/fs/f2fs/file.c @@ -4355,48 +4355,51 @@ static ssize_t f2fs_file_write_iter(struct kiocb *iocb, struct iov_iter *from) } ret = generic_write_checks(iocb, from); - if (ret > 0) { - if (iocb->ki_flags & IOCB_NOWAIT) { - if (!f2fs_overwrite_io(inode, iocb->ki_pos, - iov_iter_count(from)) || + if (ret <= 0) + goto out_unlock; + + if (iocb->ki_flags & IOCB_NOWAIT) { + if (!f2fs_overwrite_io(inode, iocb->ki_pos, + iov_iter_count(from)) || f2fs_has_inline_data(inode) || f2fs_force_buffered_io(inode, iocb, from)) { - ret = -EAGAIN; - goto out_unlock; - } - } - if (iocb->ki_flags & IOCB_DIRECT) { - ret = f2fs_convert_inline_inode(inode); - if (ret) - 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); - if (preallocated < 0) { - ret = preallocated; + ret = -EAGAIN; goto out_unlock; } + } - ret = __generic_file_write_iter(iocb, from); + if (iocb->ki_flags & IOCB_DIRECT) { + ret = f2fs_convert_inline_inode(inode); + if (ret) + 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); + if (preallocated < 0) { + ret = preallocated; + goto out_unlock; + } - /* Don't leave any preallocated blocks around past i_size. */ - if (preallocated > 0 && i_size_read(inode) < target_size) { - down_write(&F2FS_I(inode)->i_gc_rwsem[WRITE]); - filemap_invalidate_lock(inode->i_mapping); - if (!f2fs_truncate(inode)) - file_dont_truncate(inode); - filemap_invalidate_unlock(inode->i_mapping); - up_write(&F2FS_I(inode)->i_gc_rwsem[WRITE]); - } else { + ret = __generic_file_write_iter(iocb, from); + + /* Don't leave any preallocated blocks around past i_size. */ + if (preallocated > 0 && i_size_read(inode) < target_size) { + down_write(&F2FS_I(inode)->i_gc_rwsem[WRITE]); + filemap_invalidate_lock(inode->i_mapping); + if (!f2fs_truncate(inode)) file_dont_truncate(inode); - } + filemap_invalidate_unlock(inode->i_mapping); + up_write(&F2FS_I(inode)->i_gc_rwsem[WRITE]); + } else { + file_dont_truncate(inode); + } - clear_inode_flag(inode, FI_PREALLOCATED_ALL); + clear_inode_flag(inode, FI_PREALLOCATED_ALL); + + if (ret > 0) + f2fs_update_iostat(F2FS_I_SB(inode), APP_WRITE_IO, ret); - if (ret > 0) - f2fs_update_iostat(F2FS_I_SB(inode), APP_WRITE_IO, ret); - } out_unlock: inode_unlock(inode); out: -- 2.34.0.rc1.387.gb447b232ab-goog _______________________________________________ Linux-f2fs-devel mailing list Linux-f2fs-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
next prev parent reply other threads:[~2021-11-16 21:45 UTC|newest] Thread overview: 64+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-11-16 21:45 [PATCH 1/6] f2fs: rework write preallocations Jaegeuk Kim 2021-11-16 21:45 ` [f2fs-dev] " Jaegeuk Kim 2021-11-16 21:45 ` [PATCH 2/6] f2fs: do not expose unwritten blocks to user by DIO Jaegeuk Kim 2021-11-16 21:45 ` [f2fs-dev] " Jaegeuk Kim 2021-11-17 15:16 ` Chao Yu 2021-11-17 15:16 ` Chao Yu 2021-11-17 19:32 ` Jaegeuk Kim 2021-11-17 19:32 ` Jaegeuk Kim 2021-11-23 6:59 ` [f2fs] e029ce2460: aim7.jobs-per-min -35.8% regression kernel test robot 2021-11-23 6:59 ` kernel test robot 2021-12-02 2:39 ` [f2fs-dev] [PATCH 2/6] f2fs: do not expose unwritten blocks to user by DIO Chao Yu 2021-12-02 2:39 ` Chao Yu 2021-12-02 18:13 ` Jaegeuk Kim 2021-12-02 18:13 ` Jaegeuk Kim 2021-12-03 6:43 ` Chao Yu 2021-12-03 6:43 ` Chao Yu 2021-12-03 22:53 ` Jaegeuk Kim 2021-12-03 22:53 ` Jaegeuk Kim 2021-12-04 19:01 ` [f2fs-dev] [PATCH 2/6 v2] " Jaegeuk Kim 2021-12-04 19:01 ` Jaegeuk Kim 2021-11-16 21:45 ` Jaegeuk Kim [this message] 2021-11-16 21:45 ` [f2fs-dev] [PATCH 3/6] f2fs: reduce indentation in f2fs_file_write_iter() Jaegeuk Kim 2021-12-02 2:58 ` Chao Yu 2021-12-02 2:58 ` Chao Yu 2021-11-16 21:45 ` [PATCH 4/6] f2fs: fix the f2fs_file_write_iter tracepoint Jaegeuk Kim 2021-11-16 21:45 ` [f2fs-dev] " Jaegeuk Kim 2021-12-02 2:59 ` Chao Yu 2021-12-02 2:59 ` Chao Yu 2021-11-16 21:45 ` [PATCH 5/6] f2fs: implement iomap operations Jaegeuk Kim 2021-11-16 21:45 ` [f2fs-dev] " Jaegeuk Kim 2021-12-02 3:10 ` Chao Yu 2021-12-02 3:10 ` Chao Yu 2021-12-02 4:15 ` Eric Biggers 2021-12-02 4:15 ` Eric Biggers 2021-12-02 14:04 ` Chao Yu 2021-12-02 14:04 ` Chao Yu 2021-12-02 18:25 ` Eric Biggers 2021-12-02 18:25 ` Eric Biggers 2021-12-02 18:57 ` Jaegeuk Kim 2021-12-02 18:57 ` Jaegeuk Kim 2021-12-02 19:00 ` Jaegeuk Kim 2021-12-02 19:00 ` Jaegeuk Kim 2021-12-02 20:57 ` Eric Biggers 2021-12-02 20:57 ` Eric Biggers 2021-12-02 21:19 ` Jaegeuk Kim 2021-12-02 21:19 ` Jaegeuk Kim 2021-12-02 21:28 ` Jaegeuk Kim 2021-12-02 21:28 ` Jaegeuk Kim 2021-12-03 6:51 ` Chao Yu 2021-12-03 6:51 ` Chao Yu 2021-12-30 6:43 ` Chao Yu 2021-12-30 6:43 ` Chao Yu 2022-01-04 21:15 ` Jaegeuk Kim 2022-01-04 21:15 ` Jaegeuk Kim 2021-11-16 21:45 ` [PATCH 6/6] f2fs: use iomap for direct I/O Jaegeuk Kim 2021-11-16 21:45 ` [f2fs-dev] " Jaegeuk Kim 2021-12-10 23:58 ` Jaegeuk Kim 2021-12-10 23:58 ` [f2fs-dev] " Jaegeuk Kim 2021-11-17 13:31 ` [f2fs-dev] [PATCH 1/6] f2fs: rework write preallocations Chao Yu 2021-11-17 13:31 ` Chao Yu 2021-11-17 19:27 ` Jaegeuk Kim 2021-11-17 19:27 ` Jaegeuk Kim 2021-11-18 6:47 ` Chao Yu 2021-11-18 6:47 ` Chao Yu
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20211116214510.2934905-3-jaegeuk@kernel.org \ --to=jaegeuk@kernel.org \ --cc=ebiggers@google.com \ --cc=linux-f2fs-devel@lists.sourceforge.net \ --cc=linux-kernel@vger.kernel.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
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.