diff options
| -rw-r--r-- | fs/ntfs3/file.c | 10 | ||||
| -rw-r--r-- | fs/ntfs3/ntfs_fs.h | 1 | ||||
| -rw-r--r-- | fs/ntfs3/super.c | 1 |
3 files changed, 12 insertions, 0 deletions
diff --git a/fs/ntfs3/file.c b/fs/ntfs3/file.c index b9484f48db34..3b22c7375616 100644 --- a/fs/ntfs3/file.c +++ b/fs/ntfs3/file.c @@ -941,6 +941,16 @@ static ssize_t ntfs_file_read_iter(struct kiocb *iocb, struct iov_iter *iter) file->f_ra.ra_pages = 0; } + /* Check minimum alignment for dio. */ + if (iocb->ki_flags & IOCB_DIRECT) { + struct super_block *sb = inode->i_sb; + struct ntfs_sb_info *sbi = sb->s_fs_info; + if ((iocb->ki_pos | iov_iter_alignment(iter)) & + sbi->bdev_blocksize_mask) { + iocb->ki_flags &= ~IOCB_DIRECT; + } + } + return generic_file_read_iter(iocb, iter); } diff --git a/fs/ntfs3/ntfs_fs.h b/fs/ntfs3/ntfs_fs.h index 8ff49c5a2973..a4559c9f64e6 100644 --- a/fs/ntfs3/ntfs_fs.h +++ b/fs/ntfs3/ntfs_fs.h @@ -212,6 +212,7 @@ struct ntfs_sb_info { u32 discard_granularity; u64 discard_granularity_mask_inv; // ~(discard_granularity_mask_inv-1) + u32 bdev_blocksize_mask; // bdev_logical_block_size(bdev) - 1; u32 cluster_size; // bytes per cluster u32 cluster_mask; // == cluster_size - 1 diff --git a/fs/ntfs3/super.c b/fs/ntfs3/super.c index 96f56333cf99..f481e9df0237 100644 --- a/fs/ntfs3/super.c +++ b/fs/ntfs3/super.c @@ -1075,6 +1075,7 @@ read_boot: dev_size += sector_size - 1; } + sbi->bdev_blocksize_mask = max(boot_sector_size, sector_size) - 1; sbi->mft.lbo = mlcn << cluster_bits; sbi->mft.lbo2 = mlcn2 << cluster_bits; |