MIRRORS/linux-yocto
1
0
Fork 0
mirror of git://git.yoctoproject.org/linux-yocto.git synced 2025-10-22 23:13:01 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

erofs: clarify direct I/O support

Browse Source 
Currently, only filesystems backed by block devices support direct I/O.

Also remove the unnecessary strict checks that can be supported with iomap.

Signed-off-by: Gao Xiang <hsiangkao@linux.alibaba.com>
Link: https://lore.kernel.org/r/20241115074625.2520728-1-hsiangkao@linux.alibaba.com
This commit is contained in:
Gao Xiang 2024-11-15 15:46:25 +08:00
parent bae0854160
commit b49c0215b1
2 changed files with 7 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
fs/erofs/data.c
View File

@ -405,22 +405,9 @@ static ssize_t erofs_file_read_iter(struct kiocb *iocb, struct iov_iter *to)
if (IS_DAX(inode)) if (IS_DAX(inode))
return dax_iomap_rw(iocb, to, &erofs_iomap_ops); return dax_iomap_rw(iocb, to, &erofs_iomap_ops);
#endif #endif
if (iocb->ki_flags & IOCB_DIRECT) { if ((iocb->ki_flags & IOCB_DIRECT) && inode->i_sb->s_bdev)
struct block_device *bdev = inode->i_sb->s_bdev;
unsigned int blksize_mask;
if (bdev)
blksize_mask = bdev_logical_block_size(bdev) - 1;
else
blksize_mask = i_blocksize(inode) - 1;
if ((iocb->ki_pos | iov_iter_count(to) |
iov_iter_alignment(to)) & blksize_mask)
return -EINVAL;
return iomap_dio_rw(iocb, to, &erofs_iomap_ops, return iomap_dio_rw(iocb, to, &erofs_iomap_ops,
NULL, 0, NULL, 0); NULL, 0, NULL, 0);
}
return filemap_read(iocb, to, 0); return filemap_read(iocb, to, 0);
} }

12
fs/erofs/inode.c
View File

@ -318,6 +318,7 @@ int erofs_getattr(struct mnt_idmap *idmap, const struct path *path,
unsigned int query_flags) unsigned int query_flags)
{ {
struct inode *const inode = d_inode(path->dentry); struct inode *const inode = d_inode(path->dentry);
struct block_device *bdev = inode->i_sb->s_bdev;
bool compressed = bool compressed =
erofs_inode_is_data_compressed(EROFS_I(inode)->datalayout); erofs_inode_is_data_compressed(EROFS_I(inode)->datalayout);
@ -330,15 +331,14 @@ int erofs_getattr(struct mnt_idmap *idmap, const struct path *path,
/* /*
* Return the DIO alignment restrictions if requested. * Return the DIO alignment restrictions if requested.
* *
* In EROFS, STATX_DIOALIGN is not supported in ondemand mode and * In EROFS, STATX_DIOALIGN is only supported in bdev-based mode
* compressed files, so in these cases we report no DIO support. * and uncompressed inodes, otherwise we report no DIO support.
*/ */
if ((request_mask & STATX_DIOALIGN) && S_ISREG(inode->i_mode)) { if ((request_mask & STATX_DIOALIGN) && S_ISREG(inode->i_mode)) {
stat->result_mask |= STATX_DIOALIGN; stat->result_mask |= STATX_DIOALIGN;
if (!erofs_is_fscache_mode(inode->i_sb) && !compressed) { if (bdev && !compressed) {
stat->dio_mem_align = stat->dio_mem_align = bdev_dma_alignment(bdev) + 1;
bdev_logical_block_size(inode->i_sb->s_bdev); stat->dio_offset_align = bdev_logical_block_size(bdev);
stat->dio_offset_align = stat->dio_mem_align;
} }
} }
generic_fillattr(idmap, request_mask, inode, stat); generic_fillattr(idmap, request_mask, inode, stat);