|
@@ -3404,7 +3404,7 @@ static int ext4_releasepage(struct page *page, gfp_t wait)
|
|
|
static int ext4_iomap_begin(struct inode *inode, loff_t offset, loff_t length,
|
|
|
unsigned flags, struct iomap *iomap)
|
|
|
{
|
|
|
- struct block_device *bdev;
|
|
|
+ struct ext4_sb_info *sbi = EXT4_SB(inode->i_sb);
|
|
|
unsigned int blkbits = inode->i_blkbits;
|
|
|
unsigned long first_block = offset >> blkbits;
|
|
|
unsigned long last_block = (offset + length - 1) >> blkbits;
|
|
@@ -3473,12 +3473,8 @@ retry:
|
|
|
}
|
|
|
|
|
|
iomap->flags = 0;
|
|
|
- bdev = inode->i_sb->s_bdev;
|
|
|
- iomap->bdev = bdev;
|
|
|
- if (blk_queue_dax(bdev->bd_queue))
|
|
|
- iomap->dax_dev = fs_dax_get_by_host(bdev->bd_disk->disk_name);
|
|
|
- else
|
|
|
- iomap->dax_dev = NULL;
|
|
|
+ iomap->bdev = inode->i_sb->s_bdev;
|
|
|
+ iomap->dax_dev = sbi->s_daxdev;
|
|
|
iomap->offset = first_block << blkbits;
|
|
|
|
|
|
if (ret == 0) {
|
|
@@ -3511,7 +3507,6 @@ static int ext4_iomap_end(struct inode *inode, loff_t offset, loff_t length,
|
|
|
int blkbits = inode->i_blkbits;
|
|
|
bool truncate = false;
|
|
|
|
|
|
- fs_put_dax(iomap->dax_dev);
|
|
|
if (!(flags & IOMAP_WRITE) || (flags & IOMAP_FAULT))
|
|
|
return 0;
|
|
|
|