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: [PATCH v4 5/9] f2fs: move f2fs_force_buffered_io() into file.c Date: Fri, 22 Jul 2022 00:12:24 -0700 [thread overview] Message-ID: <20220722071228.146690-6-ebiggers@kernel.org> (raw) In-Reply-To: <20220722071228.146690-1-ebiggers@kernel.org> From: Eric Biggers <ebiggers@google.com> f2fs_force_buffered_io() is only used in file.c, so move it into there. No behavior change. This makes it easier to review later patches. Signed-off-by: Eric Biggers <ebiggers@google.com> --- fs/f2fs/f2fs.h | 45 --------------------------------------------- fs/f2fs/file.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h index 7869e749700fc2..d187b7d7ed2435 100644 --- a/fs/f2fs/f2fs.h +++ b/fs/f2fs/f2fs.h @@ -4426,17 +4426,6 @@ static inline void f2fs_i_compr_blocks_update(struct inode *inode, f2fs_mark_inode_dirty_sync(inode, true); } -static inline 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_allow_multi_device_dio(struct f2fs_sb_info *sbi, int flag) { @@ -4447,40 +4436,6 @@ static inline bool f2fs_allow_multi_device_dio(struct f2fs_sb_info *sbi, return sbi->aligned_blksize; } -static inline bool f2fs_force_buffered_io(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); - - if (!fscrypt_dio_supported(inode)) - return true; - if (fsverity_active(inode)) - return true; - if (f2fs_compressed_file(inode)) - return true; - - /* disallow direct IO if any of devices has unaligned blksize */ - if (f2fs_is_multi_device(sbi) && !sbi->aligned_blksize) - return true; - /* - * for blkzoned device, fallback direct IO to buffered IO, so - * all IOs can be serialized by log-structured write. - */ - if (f2fs_sb_has_blkzoned(sbi)) - return true; - if (f2fs_lfs_mode(sbi) && (rw == WRITE)) { - if (block_unaligned_IO(inode, iocb, iter)) - return true; - if (F2FS_IO_ALIGNED(sbi)) - return true; - } - if (is_sbi_flag_set(F2FS_I_SB(inode), SBI_CP_DISABLED)) - return true; - - return false; -} - static inline bool f2fs_need_verity(const struct inode *inode, pgoff_t idx) { return fsverity_active(inode) && diff --git a/fs/f2fs/file.c b/fs/f2fs/file.c index bd14cef1b08fd2..5e5c97fccfb4ee 100644 --- a/fs/f2fs/file.c +++ b/fs/f2fs/file.c @@ -808,6 +808,51 @@ 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) +{ + struct f2fs_sb_info *sbi = F2FS_I_SB(inode); + int rw = iov_iter_rw(iter); + + if (!fscrypt_dio_supported(inode)) + return true; + if (fsverity_active(inode)) + return true; + if (f2fs_compressed_file(inode)) + return true; + + /* disallow direct IO if any of devices has unaligned blksize */ + if (f2fs_is_multi_device(sbi) && !sbi->aligned_blksize) + return true; + /* + * for blkzoned device, fallback direct IO to buffered IO, so + * all IOs can be serialized by log-structured write. + */ + if (f2fs_sb_has_blkzoned(sbi)) + return true; + if (f2fs_lfs_mode(sbi) && (rw == WRITE)) { + if (block_unaligned_IO(inode, iocb, iter)) + return true; + if (F2FS_IO_ALIGNED(sbi)) + return true; + } + if (is_sbi_flag_set(F2FS_I_SB(inode), SBI_CP_DISABLED)) + return true; + + return false; +} + int f2fs_getattr(struct user_namespace *mnt_userns, const struct path *path, struct kstat *stat, u32 request_mask, unsigned int query_flags) { -- 2.37.0
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] [PATCH v4 5/9] f2fs: move f2fs_force_buffered_io() into file.c Date: Fri, 22 Jul 2022 00:12:24 -0700 [thread overview] Message-ID: <20220722071228.146690-6-ebiggers@kernel.org> (raw) In-Reply-To: <20220722071228.146690-1-ebiggers@kernel.org> From: Eric Biggers <ebiggers@google.com> f2fs_force_buffered_io() is only used in file.c, so move it into there. No behavior change. This makes it easier to review later patches. Signed-off-by: Eric Biggers <ebiggers@google.com> --- fs/f2fs/f2fs.h | 45 --------------------------------------------- fs/f2fs/file.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h index 7869e749700fc2..d187b7d7ed2435 100644 --- a/fs/f2fs/f2fs.h +++ b/fs/f2fs/f2fs.h @@ -4426,17 +4426,6 @@ static inline void f2fs_i_compr_blocks_update(struct inode *inode, f2fs_mark_inode_dirty_sync(inode, true); } -static inline 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_allow_multi_device_dio(struct f2fs_sb_info *sbi, int flag) { @@ -4447,40 +4436,6 @@ static inline bool f2fs_allow_multi_device_dio(struct f2fs_sb_info *sbi, return sbi->aligned_blksize; } -static inline bool f2fs_force_buffered_io(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); - - if (!fscrypt_dio_supported(inode)) - return true; - if (fsverity_active(inode)) - return true; - if (f2fs_compressed_file(inode)) - return true; - - /* disallow direct IO if any of devices has unaligned blksize */ - if (f2fs_is_multi_device(sbi) && !sbi->aligned_blksize) - return true; - /* - * for blkzoned device, fallback direct IO to buffered IO, so - * all IOs can be serialized by log-structured write. - */ - if (f2fs_sb_has_blkzoned(sbi)) - return true; - if (f2fs_lfs_mode(sbi) && (rw == WRITE)) { - if (block_unaligned_IO(inode, iocb, iter)) - return true; - if (F2FS_IO_ALIGNED(sbi)) - return true; - } - if (is_sbi_flag_set(F2FS_I_SB(inode), SBI_CP_DISABLED)) - return true; - - return false; -} - static inline bool f2fs_need_verity(const struct inode *inode, pgoff_t idx) { return fsverity_active(inode) && diff --git a/fs/f2fs/file.c b/fs/f2fs/file.c index bd14cef1b08fd2..5e5c97fccfb4ee 100644 --- a/fs/f2fs/file.c +++ b/fs/f2fs/file.c @@ -808,6 +808,51 @@ 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) +{ + struct f2fs_sb_info *sbi = F2FS_I_SB(inode); + int rw = iov_iter_rw(iter); + + if (!fscrypt_dio_supported(inode)) + return true; + if (fsverity_active(inode)) + return true; + if (f2fs_compressed_file(inode)) + return true; + + /* disallow direct IO if any of devices has unaligned blksize */ + if (f2fs_is_multi_device(sbi) && !sbi->aligned_blksize) + return true; + /* + * for blkzoned device, fallback direct IO to buffered IO, so + * all IOs can be serialized by log-structured write. + */ + if (f2fs_sb_has_blkzoned(sbi)) + return true; + if (f2fs_lfs_mode(sbi) && (rw == WRITE)) { + if (block_unaligned_IO(inode, iocb, iter)) + return true; + if (F2FS_IO_ALIGNED(sbi)) + return true; + } + if (is_sbi_flag_set(F2FS_I_SB(inode), SBI_CP_DISABLED)) + return true; + + return false; +} + int f2fs_getattr(struct user_namespace *mnt_userns, const struct path *path, struct kstat *stat, u32 request_mask, unsigned int query_flags) { -- 2.37.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:[~2022-07-22 7:14 UTC|newest] Thread overview: 61+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-07-22 7:12 [PATCH v4 0/9] make statx() return DIO alignment information Eric Biggers 2022-07-22 7:12 ` [f2fs-dev] " Eric Biggers 2022-07-22 7:12 ` [PATCH v4 1/9] statx: add direct I/O " Eric Biggers 2022-07-22 7:12 ` [f2fs-dev] " Eric Biggers 2022-07-22 16:32 ` Darrick J. Wong 2022-07-22 16:32 ` [f2fs-dev] " Darrick J. Wong 2022-07-22 17:31 ` Martin K. Petersen 2022-07-22 17:31 ` [f2fs-dev] " Martin K. Petersen 2022-07-22 7:12 ` [PATCH v4 2/9] vfs: support STATX_DIOALIGN on block devices Eric Biggers 2022-07-22 7:12 ` [f2fs-dev] " Eric Biggers 2022-07-22 8:10 ` Christoph Hellwig 2022-07-22 8:10 ` [f2fs-dev] " Christoph Hellwig 2022-07-22 17:32 ` Martin K. Petersen 2022-07-22 17:32 ` [f2fs-dev] " Martin K. Petersen 2022-07-22 7:12 ` [PATCH v4 3/9] fscrypt: change fscrypt_dio_supported() to prepare for STATX_DIOALIGN Eric Biggers 2022-07-22 7:12 ` [f2fs-dev] " Eric Biggers 2022-07-22 8:10 ` Christoph Hellwig 2022-07-22 8:10 ` [f2fs-dev] " Christoph Hellwig 2022-07-22 7:12 ` [PATCH v4 4/9] ext4: support STATX_DIOALIGN Eric Biggers 2022-07-22 7:12 ` [f2fs-dev] " Eric Biggers 2022-07-22 17:05 ` Theodore Ts'o 2022-07-22 17:05 ` [f2fs-dev] " Theodore Ts'o 2022-07-22 7:12 ` Eric Biggers [this message] 2022-07-22 7:12 ` [f2fs-dev] [PATCH v4 5/9] f2fs: move f2fs_force_buffered_io() into file.c Eric Biggers 2022-07-22 7:12 ` [PATCH v4 6/9] f2fs: don't allow DIO reads but not DIO writes Eric Biggers 2022-07-22 7:12 ` [f2fs-dev] " Eric Biggers 2022-07-24 2:01 ` Jaegeuk Kim 2022-07-24 2:01 ` [f2fs-dev] " Jaegeuk Kim 2022-07-25 18:12 ` Eric Biggers 2022-07-25 18:12 ` [f2fs-dev] " Eric Biggers 2022-07-25 23:58 ` Andreas Dilger 2022-07-31 3:08 ` Jaegeuk Kim 2022-07-31 3:08 ` [f2fs-dev] " Jaegeuk Kim 2022-08-16 0:55 ` Eric Biggers 2022-08-16 0:55 ` Eric Biggers 2022-08-16 9:03 ` [f2fs-dev] " Dave Chinner 2022-08-16 9:03 ` Dave Chinner 2022-08-16 16:42 ` Andreas Dilger 2022-08-19 23:09 ` Eric Biggers 2022-08-19 23:09 ` [f2fs-dev] " Eric Biggers 2022-08-23 3:22 ` Andreas Dilger 2022-08-20 0:06 ` Jaegeuk Kim 2022-08-20 0:06 ` [f2fs-dev] " Jaegeuk Kim 2022-08-20 0:33 ` Eric Biggers 2022-08-20 0:33 ` Eric Biggers 2022-08-21 8:53 ` Christoph Hellwig 2022-08-21 8:53 ` [f2fs-dev] " Christoph Hellwig 2022-07-22 7:12 ` [PATCH v4 7/9] f2fs: simplify f2fs_force_buffered_io() Eric Biggers 2022-07-22 7:12 ` [f2fs-dev] " Eric Biggers 2022-07-22 7:12 ` [PATCH v4 8/9] f2fs: support STATX_DIOALIGN Eric Biggers 2022-07-22 7:12 ` [f2fs-dev] " Eric Biggers 2022-07-22 7:12 ` [PATCH v4 9/9] xfs: " Eric Biggers 2022-07-22 7:12 ` [f2fs-dev] " Eric Biggers 2022-07-22 8:11 ` Christoph Hellwig 2022-07-22 8:11 ` [f2fs-dev] " Christoph Hellwig 2022-07-22 16:24 ` Darrick J. Wong 2022-07-22 16:24 ` [f2fs-dev] " Darrick J. Wong 2022-08-26 17:19 ` [PATCH v4 0/9] make statx() return DIO alignment information Jeff Layton 2022-08-26 17:19 ` [f2fs-dev] " Jeff Layton 2022-08-27 7:07 ` Eric Biggers 2022-08-27 7:07 ` [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=20220722071228.146690-6-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.