|
@@ -180,9 +180,6 @@ blkdev_direct_IO(struct kiocb *iocb, struct iov_iter *iter)
|
|
struct file *file = iocb->ki_filp;
|
|
struct file *file = iocb->ki_filp;
|
|
struct inode *inode = bdev_file_inode(file);
|
|
struct inode *inode = bdev_file_inode(file);
|
|
|
|
|
|
- if (IS_DAX(inode))
|
|
|
|
- return dax_do_io(iocb, inode, iter, blkdev_get_block,
|
|
|
|
- NULL, DIO_SKIP_DIO_COUNT);
|
|
|
|
return __blockdev_direct_IO(iocb, inode, I_BDEV(inode), iter,
|
|
return __blockdev_direct_IO(iocb, inode, I_BDEV(inode), iter,
|
|
blkdev_get_block, NULL, NULL,
|
|
blkdev_get_block, NULL, NULL,
|
|
DIO_SKIP_DIO_COUNT);
|
|
DIO_SKIP_DIO_COUNT);
|
|
@@ -1275,7 +1272,6 @@ static int __blkdev_get(struct block_device *bdev, fmode_t mode, int for_part)
|
|
bdev->bd_disk = disk;
|
|
bdev->bd_disk = disk;
|
|
bdev->bd_queue = disk->queue;
|
|
bdev->bd_queue = disk->queue;
|
|
bdev->bd_contains = bdev;
|
|
bdev->bd_contains = bdev;
|
|
- bdev->bd_inode->i_flags = 0;
|
|
|
|
|
|
|
|
if (!partno) {
|
|
if (!partno) {
|
|
ret = -ENXIO;
|
|
ret = -ENXIO;
|
|
@@ -1303,11 +1299,8 @@ static int __blkdev_get(struct block_device *bdev, fmode_t mode, int for_part)
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
- if (!ret) {
|
|
|
|
|
|
+ if (!ret)
|
|
bd_set_size(bdev,(loff_t)get_capacity(disk)<<9);
|
|
bd_set_size(bdev,(loff_t)get_capacity(disk)<<9);
|
|
- if (!bdev_dax_capable(bdev))
|
|
|
|
- bdev->bd_inode->i_flags &= ~S_DAX;
|
|
|
|
- }
|
|
|
|
|
|
|
|
/*
|
|
/*
|
|
* If the device is invalidated, rescan partition
|
|
* If the device is invalidated, rescan partition
|
|
@@ -1342,8 +1335,6 @@ static int __blkdev_get(struct block_device *bdev, fmode_t mode, int for_part)
|
|
goto out_clear;
|
|
goto out_clear;
|
|
}
|
|
}
|
|
bd_set_size(bdev, (loff_t)bdev->bd_part->nr_sects << 9);
|
|
bd_set_size(bdev, (loff_t)bdev->bd_part->nr_sects << 9);
|
|
- if (!bdev_dax_capable(bdev))
|
|
|
|
- bdev->bd_inode->i_flags &= ~S_DAX;
|
|
|
|
}
|
|
}
|
|
} else {
|
|
} else {
|
|
if (bdev->bd_contains == bdev) {
|
|
if (bdev->bd_contains == bdev) {
|