From: Eric Biggers <ebiggers@kernel.org> To: linux-f2fs-devel@lists.sourceforge.net, Jaegeuk Kim <jaegeuk@kernel.org>, Chao Yu <chao@kernel.org> Cc: linux-fsdevel@vger.kernel.org, linux-xfs@vger.kernel.org, Satya Tangirala <satyaprateek2357@gmail.com>, Changheun Lee <nanich.lee@samsung.com>, Matthew Bobrowski <mbobrowski@mbobrowski.org> Subject: [PATCH 2/9] f2fs: remove allow_outplace_dio() Date: Fri, 16 Jul 2021 09:39:12 -0500 [thread overview] Message-ID: <20210716143919.44373-3-ebiggers@kernel.org> (raw) In-Reply-To: <20210716143919.44373-1-ebiggers@kernel.org> From: Eric Biggers <ebiggers@google.com> We can just check f2fs_lfs_mode() directly. The block_unaligned_IO() check is redundant because in LFS mode, f2fs doesn't do direct I/O writes that aren't block-aligned (due to f2fs_force_buffered_io() returning true in this case, triggering the fallback to buffered I/O). Signed-off-by: Eric Biggers <ebiggers@google.com> --- fs/f2fs/data.c | 2 +- fs/f2fs/f2fs.h | 10 ---------- fs/f2fs/file.c | 2 +- 3 files changed, 2 insertions(+), 12 deletions(-) diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c index c478964a5695..18cb28a514e6 100644 --- a/fs/f2fs/data.c +++ b/fs/f2fs/data.c @@ -3551,7 +3551,7 @@ static ssize_t f2fs_direct_IO(struct kiocb *iocb, struct iov_iter *iter) if (f2fs_force_buffered_io(inode, iocb, iter)) return 0; - do_opu = allow_outplace_dio(inode, iocb, iter); + do_opu = (rw == WRITE && f2fs_lfs_mode(sbi)); trace_f2fs_direct_IO_enter(inode, offset, count, rw); diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h index ee8eb33e2c25..ad7c1b94e23a 100644 --- a/fs/f2fs/f2fs.h +++ b/fs/f2fs/f2fs.h @@ -4305,16 +4305,6 @@ static inline int block_unaligned_IO(struct inode *inode, return align & blocksize_mask; } -static inline int allow_outplace_dio(struct inode *inode, - struct kiocb *iocb, struct iov_iter *iter) -{ - struct f2fs_sb_info *sbi = F2FS_I_SB(inode); - int rw = iov_iter_rw(iter); - - return (f2fs_lfs_mode(sbi) && (rw == WRITE) && - !block_unaligned_IO(inode, iocb, iter)); -} - static inline bool f2fs_force_buffered_io(struct inode *inode, struct kiocb *iocb, struct iov_iter *iter) { diff --git a/fs/f2fs/file.c b/fs/f2fs/file.c index 6afd4562335f..b1cb5b50faac 100644 --- a/fs/f2fs/file.c +++ b/fs/f2fs/file.c @@ -4292,7 +4292,7 @@ static ssize_t f2fs_file_write_iter(struct kiocb *iocb, struct iov_iter *from) * back to buffered IO. */ if (!f2fs_force_buffered_io(inode, iocb, from) && - allow_outplace_dio(inode, iocb, from)) + f2fs_lfs_mode(F2FS_I_SB(inode))) goto write; } preallocated = true; -- 2.32.0
WARNING: multiple messages have this Message-ID (diff)
From: Eric Biggers <ebiggers@kernel.org> To: linux-f2fs-devel@lists.sourceforge.net, Jaegeuk Kim <jaegeuk@kernel.org>, Chao Yu <chao@kernel.org> Cc: linux-fsdevel@vger.kernel.org, linux-xfs@vger.kernel.org, Matthew Bobrowski <mbobrowski@mbobrowski.org>, Satya Tangirala <satyaprateek2357@gmail.com>, Changheun Lee <nanich.lee@samsung.com> Subject: [f2fs-dev] [PATCH 2/9] f2fs: remove allow_outplace_dio() Date: Fri, 16 Jul 2021 09:39:12 -0500 [thread overview] Message-ID: <20210716143919.44373-3-ebiggers@kernel.org> (raw) In-Reply-To: <20210716143919.44373-1-ebiggers@kernel.org> From: Eric Biggers <ebiggers@google.com> We can just check f2fs_lfs_mode() directly. The block_unaligned_IO() check is redundant because in LFS mode, f2fs doesn't do direct I/O writes that aren't block-aligned (due to f2fs_force_buffered_io() returning true in this case, triggering the fallback to buffered I/O). Signed-off-by: Eric Biggers <ebiggers@google.com> --- fs/f2fs/data.c | 2 +- fs/f2fs/f2fs.h | 10 ---------- fs/f2fs/file.c | 2 +- 3 files changed, 2 insertions(+), 12 deletions(-) diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c index c478964a5695..18cb28a514e6 100644 --- a/fs/f2fs/data.c +++ b/fs/f2fs/data.c @@ -3551,7 +3551,7 @@ static ssize_t f2fs_direct_IO(struct kiocb *iocb, struct iov_iter *iter) if (f2fs_force_buffered_io(inode, iocb, iter)) return 0; - do_opu = allow_outplace_dio(inode, iocb, iter); + do_opu = (rw == WRITE && f2fs_lfs_mode(sbi)); trace_f2fs_direct_IO_enter(inode, offset, count, rw); diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h index ee8eb33e2c25..ad7c1b94e23a 100644 --- a/fs/f2fs/f2fs.h +++ b/fs/f2fs/f2fs.h @@ -4305,16 +4305,6 @@ static inline int block_unaligned_IO(struct inode *inode, return align & blocksize_mask; } -static inline int allow_outplace_dio(struct inode *inode, - struct kiocb *iocb, struct iov_iter *iter) -{ - struct f2fs_sb_info *sbi = F2FS_I_SB(inode); - int rw = iov_iter_rw(iter); - - return (f2fs_lfs_mode(sbi) && (rw == WRITE) && - !block_unaligned_IO(inode, iocb, iter)); -} - static inline bool f2fs_force_buffered_io(struct inode *inode, struct kiocb *iocb, struct iov_iter *iter) { diff --git a/fs/f2fs/file.c b/fs/f2fs/file.c index 6afd4562335f..b1cb5b50faac 100644 --- a/fs/f2fs/file.c +++ b/fs/f2fs/file.c @@ -4292,7 +4292,7 @@ static ssize_t f2fs_file_write_iter(struct kiocb *iocb, struct iov_iter *from) * back to buffered IO. */ if (!f2fs_force_buffered_io(inode, iocb, from) && - allow_outplace_dio(inode, iocb, from)) + f2fs_lfs_mode(F2FS_I_SB(inode))) goto write; } preallocated = true; -- 2.32.0 _______________________________________________ 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-07-16 14:40 UTC|newest] Thread overview: 66+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-07-16 14:39 [PATCH 0/9] f2fs: use iomap for direct I/O Eric Biggers 2021-07-16 14:39 ` [f2fs-dev] " Eric Biggers 2021-07-16 14:39 ` [PATCH 1/9] f2fs: make f2fs_write_failed() take struct inode Eric Biggers 2021-07-16 14:39 ` [f2fs-dev] " Eric Biggers 2021-07-25 10:00 ` Chao Yu 2021-07-25 10:00 ` [f2fs-dev] " Chao Yu 2021-07-16 14:39 ` Eric Biggers [this message] 2021-07-16 14:39 ` [f2fs-dev] [PATCH 2/9] f2fs: remove allow_outplace_dio() Eric Biggers 2021-07-19 8:41 ` Christoph Hellwig 2021-07-19 8:41 ` [f2fs-dev] " Christoph Hellwig 2021-07-16 14:39 ` [PATCH 3/9] f2fs: rework write preallocations Eric Biggers 2021-07-16 14:39 ` [f2fs-dev] " Eric Biggers 2021-07-25 10:50 ` Chao Yu 2021-07-25 10:50 ` [f2fs-dev] " Chao Yu 2021-07-25 17:57 ` Eric Biggers 2021-07-25 17:57 ` [f2fs-dev] " Eric Biggers 2021-07-27 2:00 ` Jaegeuk Kim 2021-07-27 2:00 ` [f2fs-dev] " Jaegeuk Kim 2021-07-27 3:23 ` Chao Yu 2021-07-27 3:23 ` [f2fs-dev] " Chao Yu 2021-07-27 7:38 ` Eric Biggers 2021-07-27 7:38 ` [f2fs-dev] " Eric Biggers 2021-07-27 8:30 ` Chao Yu 2021-07-27 8:30 ` [f2fs-dev] " Chao Yu 2021-07-27 15:33 ` Darrick J. Wong 2021-07-27 15:33 ` [f2fs-dev] " Darrick J. Wong 2021-07-29 0:26 ` Chao Yu 2021-07-29 0:26 ` [f2fs-dev] " Chao Yu 2021-07-28 2:29 ` Jaegeuk Kim 2021-07-28 2:29 ` [f2fs-dev] " Jaegeuk Kim 2021-07-25 15:35 ` Jaegeuk Kim 2021-07-25 15:35 ` [f2fs-dev] " Jaegeuk Kim 2021-07-25 15:47 ` Jaegeuk Kim 2021-07-25 15:47 ` [f2fs-dev] " Jaegeuk Kim 2021-07-25 18:01 ` Eric Biggers 2021-07-25 18:01 ` [f2fs-dev] " Eric Biggers 2021-07-26 19:04 ` Jaegeuk Kim 2021-07-26 19:04 ` [f2fs-dev] " Jaegeuk Kim 2021-07-16 14:39 ` [PATCH 4/9] f2fs: reduce indentation in f2fs_file_write_iter() Eric Biggers 2021-07-16 14:39 ` [f2fs-dev] " Eric Biggers 2021-07-16 14:39 ` [PATCH 5/9] f2fs: fix the f2fs_file_write_iter tracepoint Eric Biggers 2021-07-16 14:39 ` [f2fs-dev] " Eric Biggers 2021-07-16 14:39 ` [PATCH 6/9] f2fs: implement iomap operations Eric Biggers 2021-07-16 14:39 ` [f2fs-dev] " Eric Biggers 2021-07-19 8:59 ` Christoph Hellwig 2021-07-19 8:59 ` [f2fs-dev] " Christoph Hellwig 2021-07-22 20:47 ` Jaegeuk Kim 2021-07-22 20:47 ` [f2fs-dev] " Jaegeuk Kim 2021-07-22 20:49 ` Jaegeuk Kim 2021-07-22 20:49 ` [f2fs-dev] " Jaegeuk Kim 2021-07-22 20:54 ` Eric Biggers 2021-07-22 20:54 ` [f2fs-dev] " Eric Biggers 2021-07-22 21:57 ` Jaegeuk Kim 2021-07-22 21:57 ` [f2fs-dev] " Jaegeuk Kim 2021-07-23 1:52 ` Eric Biggers 2021-07-23 1:52 ` [f2fs-dev] " Eric Biggers 2021-07-23 5:00 ` Christoph Hellwig 2021-07-23 5:00 ` [f2fs-dev] " Christoph Hellwig 2021-07-23 8:05 ` Eric Biggers 2021-07-23 8:05 ` [f2fs-dev] " Eric Biggers 2021-07-16 14:39 ` [PATCH 7/9] f2fs: use iomap for direct I/O reads Eric Biggers 2021-07-16 14:39 ` [f2fs-dev] " Eric Biggers 2021-07-16 14:39 ` [PATCH 8/9] f2fs: use iomap for direct I/O writes Eric Biggers 2021-07-16 14:39 ` [f2fs-dev] " Eric Biggers 2021-07-16 14:39 ` [PATCH 9/9] f2fs: remove f2fs_direct_IO() Eric Biggers 2021-07-16 14:39 ` [f2fs-dev] " Eric Biggers
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=20210716143919.44373-3-ebiggers@kernel.org \ --to=ebiggers@kernel.org \ --cc=chao@kernel.org \ --cc=jaegeuk@kernel.org \ --cc=linux-f2fs-devel@lists.sourceforge.net \ --cc=linux-fsdevel@vger.kernel.org \ --cc=linux-xfs@vger.kernel.org \ --cc=mbobrowski@mbobrowski.org \ --cc=nanich.lee@samsung.com \ --cc=satyaprateek2357@gmail.com \ /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.