From: Eric Biggers <ebiggers@kernel.org> To: linux-fsdevel@vger.kernel.org Cc: linux-ext4@vger.kernel.org, linux-f2fs-devel@lists.sourceforge.net, linux-xfs@vger.kernel.org, linux-api@vger.kernel.org, linux-fscrypt@vger.kernel.org, linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, Keith Busch <kbusch@kernel.org> Subject: [RFC PATCH v2 6/7] f2fs: simplify f2fs_force_buffered_io() Date: Wed, 18 May 2022 16:50:10 -0700 [thread overview] Message-ID: <20220518235011.153058-7-ebiggers@kernel.org> (raw) In-Reply-To: <20220518235011.153058-1-ebiggers@kernel.org> From: Eric Biggers <ebiggers@google.com> f2fs only allows direct I/O that is aligned to the filesystem block size. Given that fact, simplify f2fs_force_buffered_io() by removing the redundant call to block_unaligned_IO(). This makes it easier to reuse this code for STATX_IOALIGN. Signed-off-by: Eric Biggers <ebiggers@google.com> --- fs/f2fs/file.c | 24 ++++-------------------- 1 file changed, 4 insertions(+), 20 deletions(-) diff --git a/fs/f2fs/file.c b/fs/f2fs/file.c index 68947fe16ea35..c32f7722ba6b0 100644 --- a/fs/f2fs/file.c +++ b/fs/f2fs/file.c @@ -807,19 +807,7 @@ int f2fs_truncate(struct inode *inode) return 0; } -static int block_unaligned_IO(struct inode *inode, struct kiocb *iocb, - struct iov_iter *iter) -{ - unsigned int i_blkbits = READ_ONCE(inode->i_blkbits); - unsigned int blocksize_mask = (1 << i_blkbits) - 1; - loff_t offset = iocb->ki_pos; - unsigned long align = offset | iov_iter_alignment(iter); - - return align & blocksize_mask; -} - -static inline bool f2fs_force_buffered_io(struct inode *inode, - struct kiocb *iocb, struct iov_iter *iter) +static bool f2fs_force_buffered_io(struct inode *inode) { struct f2fs_sb_info *sbi = F2FS_I_SB(inode); @@ -839,12 +827,8 @@ static inline bool f2fs_force_buffered_io(struct inode *inode, */ if (f2fs_sb_has_blkzoned(sbi)) return true; - if (f2fs_lfs_mode(sbi)) { - if (block_unaligned_IO(inode, iocb, iter)) - return true; - if (F2FS_IO_ALIGNED(sbi)) - return true; - } + if (f2fs_lfs_mode(sbi) && F2FS_IO_ALIGNED(sbi)) + return true; if (is_sbi_flag_set(F2FS_I_SB(inode), SBI_CP_DISABLED)) return true; @@ -4283,7 +4267,7 @@ static bool f2fs_should_use_dio(struct inode *inode, struct kiocb *iocb, if (!(iocb->ki_flags & IOCB_DIRECT)) return false; - if (f2fs_force_buffered_io(inode, iocb, iter)) + if (f2fs_force_buffered_io(inode)) return false; /* -- 2.36.1
WARNING: multiple messages have this Message-ID (diff)
From: Eric Biggers <ebiggers@kernel.org> To: linux-fsdevel@vger.kernel.org Cc: linux-block@vger.kernel.org, linux-api@vger.kernel.org, linux-kernel@vger.kernel.org, linux-f2fs-devel@lists.sourceforge.net, linux-xfs@vger.kernel.org, linux-fscrypt@vger.kernel.org, Keith Busch <kbusch@kernel.org>, linux-ext4@vger.kernel.org Subject: [f2fs-dev] [RFC PATCH v2 6/7] f2fs: simplify f2fs_force_buffered_io() Date: Wed, 18 May 2022 16:50:10 -0700 [thread overview] Message-ID: <20220518235011.153058-7-ebiggers@kernel.org> (raw) In-Reply-To: <20220518235011.153058-1-ebiggers@kernel.org> From: Eric Biggers <ebiggers@google.com> f2fs only allows direct I/O that is aligned to the filesystem block size. Given that fact, simplify f2fs_force_buffered_io() by removing the redundant call to block_unaligned_IO(). This makes it easier to reuse this code for STATX_IOALIGN. Signed-off-by: Eric Biggers <ebiggers@google.com> --- fs/f2fs/file.c | 24 ++++-------------------- 1 file changed, 4 insertions(+), 20 deletions(-) diff --git a/fs/f2fs/file.c b/fs/f2fs/file.c index 68947fe16ea35..c32f7722ba6b0 100644 --- a/fs/f2fs/file.c +++ b/fs/f2fs/file.c @@ -807,19 +807,7 @@ int f2fs_truncate(struct inode *inode) return 0; } -static int block_unaligned_IO(struct inode *inode, struct kiocb *iocb, - struct iov_iter *iter) -{ - unsigned int i_blkbits = READ_ONCE(inode->i_blkbits); - unsigned int blocksize_mask = (1 << i_blkbits) - 1; - loff_t offset = iocb->ki_pos; - unsigned long align = offset | iov_iter_alignment(iter); - - return align & blocksize_mask; -} - -static inline bool f2fs_force_buffered_io(struct inode *inode, - struct kiocb *iocb, struct iov_iter *iter) +static bool f2fs_force_buffered_io(struct inode *inode) { struct f2fs_sb_info *sbi = F2FS_I_SB(inode); @@ -839,12 +827,8 @@ static inline bool f2fs_force_buffered_io(struct inode *inode, */ if (f2fs_sb_has_blkzoned(sbi)) return true; - if (f2fs_lfs_mode(sbi)) { - if (block_unaligned_IO(inode, iocb, iter)) - return true; - if (F2FS_IO_ALIGNED(sbi)) - return true; - } + if (f2fs_lfs_mode(sbi) && F2FS_IO_ALIGNED(sbi)) + return true; if (is_sbi_flag_set(F2FS_I_SB(inode), SBI_CP_DISABLED)) return true; @@ -4283,7 +4267,7 @@ static bool f2fs_should_use_dio(struct inode *inode, struct kiocb *iocb, if (!(iocb->ki_flags & IOCB_DIRECT)) return false; - if (f2fs_force_buffered_io(inode, iocb, iter)) + if (f2fs_force_buffered_io(inode)) return false; /* -- 2.36.1 _______________________________________________ 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:[~2022-05-18 23:53 UTC|newest] Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-05-18 23:50 [RFC PATCH v2 0/7] make statx() return I/O alignment information Eric Biggers 2022-05-18 23:50 ` [f2fs-dev] " Eric Biggers 2022-05-18 23:50 ` [RFC PATCH v2 1/7] statx: add " Eric Biggers 2022-05-18 23:50 ` [f2fs-dev] " Eric Biggers 2022-05-19 7:05 ` Christoph Hellwig 2022-05-19 7:05 ` [f2fs-dev] " Christoph Hellwig 2022-05-19 23:06 ` Darrick J. Wong 2022-05-19 23:06 ` [f2fs-dev] " Darrick J. Wong 2022-05-20 3:27 ` Dave Chinner 2022-05-20 3:27 ` [f2fs-dev] " Dave Chinner 2022-06-14 5:25 ` Eric Biggers 2022-06-14 5:25 ` [f2fs-dev] " Eric Biggers 2022-06-15 13:12 ` Christoph Hellwig 2022-06-15 13:12 ` [f2fs-dev] " Christoph Hellwig 2022-06-16 0:04 ` Eric Biggers 2022-06-16 0:04 ` [f2fs-dev] " Eric Biggers 2022-06-16 6:07 ` Christoph Hellwig 2022-06-16 6:07 ` [f2fs-dev] " Christoph Hellwig 2022-06-16 6:19 ` Eric Biggers 2022-06-16 6:19 ` [f2fs-dev] " Eric Biggers 2022-06-16 6:29 ` Christoph Hellwig 2022-06-16 6:29 ` [f2fs-dev] " Christoph Hellwig 2022-05-20 6:30 ` Eric Biggers 2022-05-20 6:30 ` [f2fs-dev] " Eric Biggers 2022-05-20 11:52 ` Christian Brauner 2022-05-20 11:52 ` [f2fs-dev] " Christian Brauner 2022-05-27 9:02 ` Florian Weimer 2022-05-27 9:02 ` Florian Weimer 2022-05-27 16:22 ` Darrick J. Wong 2022-05-27 16:22 ` [f2fs-dev] " Darrick J. Wong 2022-05-18 23:50 ` [RFC PATCH v2 2/7] fscrypt: change fscrypt_dio_supported() to prepare for STATX_IOALIGN Eric Biggers 2022-05-18 23:50 ` [f2fs-dev] " Eric Biggers 2022-05-18 23:50 ` [RFC PATCH v2 3/7] ext4: support STATX_IOALIGN Eric Biggers 2022-05-18 23:50 ` [f2fs-dev] " Eric Biggers 2022-05-18 23:50 ` [RFC PATCH v2 4/7] f2fs: move f2fs_force_buffered_io() into file.c Eric Biggers 2022-05-18 23:50 ` [f2fs-dev] " Eric Biggers 2022-05-18 23:50 ` [RFC PATCH v2 5/7] f2fs: don't allow DIO reads but not DIO writes Eric Biggers 2022-05-18 23:50 ` [f2fs-dev] " Eric Biggers 2022-05-18 23:50 ` Eric Biggers [this message] 2022-05-18 23:50 ` [f2fs-dev] [RFC PATCH v2 6/7] f2fs: simplify f2fs_force_buffered_io() Eric Biggers 2022-05-18 23:50 ` [RFC PATCH v2 7/7] f2fs: support STATX_IOALIGN Eric Biggers 2022-05-18 23:50 ` [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=20220518235011.153058-7-ebiggers@kernel.org \ --to=ebiggers@kernel.org \ --cc=kbusch@kernel.org \ --cc=linux-api@vger.kernel.org \ --cc=linux-block@vger.kernel.org \ --cc=linux-ext4@vger.kernel.org \ --cc=linux-f2fs-devel@lists.sourceforge.net \ --cc=linux-fscrypt@vger.kernel.org \ --cc=linux-fsdevel@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-xfs@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.