diff options
| author | Eric Biggers <ebiggers@google.com> | 2022-08-26 23:58:46 -0700 |
|---|---|---|
| committer | Eric Biggers <ebiggers@google.com> | 2022-09-11 19:47:12 -0500 |
| commit | 53dd3f802a6e269868cb599609287a841e65a996 (patch) | |
| tree | 78c146e44cc1b8328579a1d939fb3053ebb4d510 /fs/ext4/file.c | |
| parent | 2d985f8c6b91b5007a16e640bb9c038c5fb2839b (diff) | |
| download | linux-53dd3f802a6e269868cb599609287a841e65a996.tar.gz | |
fscrypt: change fscrypt_dio_supported() to prepare for STATX_DIOALIGN
To prepare for STATX_DIOALIGN support, make two changes to
fscrypt_dio_supported().
First, remove the filesystem-block-alignment check and make the
filesystems handle it instead. It previously made sense to have it in
fs/crypto/; however, to support STATX_DIOALIGN the alignment restriction
would have to be returned to filesystems. It ends up being simpler if
filesystems handle this part themselves, especially for f2fs which only
allows fs-block-aligned DIO in the first place.
Second, make fscrypt_dio_supported() work on inodes whose encryption key
hasn't been set up yet, by making it set up the key if needed. This is
required for statx(), since statx() doesn't require a file descriptor.
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Eric Biggers <ebiggers@google.com>
Link: https://lore.kernel.org/r/20220827065851.135710-4-ebiggers@kernel.org
Diffstat (limited to 'fs/ext4/file.c')
| -rw-r--r-- | fs/ext4/file.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/fs/ext4/file.c b/fs/ext4/file.c index 109d07629f81f..26d7426208970 100644 --- a/fs/ext4/file.c +++ b/fs/ext4/file.c @@ -40,8 +40,13 @@ static bool ext4_dio_supported(struct kiocb *iocb, struct iov_iter *iter) { struct inode *inode = file_inode(iocb->ki_filp); - if (!fscrypt_dio_supported(iocb, iter)) - return false; + if (IS_ENCRYPTED(inode)) { + if (!fscrypt_dio_supported(inode)) + return false; + if (!IS_ALIGNED(iocb->ki_pos | iov_iter_alignment(iter), + i_blocksize(inode))) + return false; + } if (fsverity_active(inode)) return false; if (ext4_should_journal_data(inode)) |