diff options
author | Dan Williams <dan.j.williams@intel.com> | 2017-01-27 15:04:59 -0500 |
---|---|---|
committer | Dan Williams <dan.j.williams@intel.com> | 2017-04-25 16:20:46 -0400 |
commit | fa5d932c323e8e0d9b24b3517997d15b36d1607d (patch) | |
tree | a340f98eaec27ee75f264871ba878007d9c6e329 /fs/ext2/inode.c | |
parent | 817bf40265459578abc36c6bd53e27775b5c7ec4 (diff) |
ext2, ext4, xfs: retrieve dax_device for iomap operations
In preparation for converting fs/dax.c to use dax_direct_access()
instead of bdev_direct_access(), add the plumbing to retrieve the
dax_device associated with a given block_device.
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Diffstat (limited to 'fs/ext2/inode.c')
-rw-r--r-- | fs/ext2/inode.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/fs/ext2/inode.c b/fs/ext2/inode.c index 128cce540645..4c9d2d44e879 100644 --- a/fs/ext2/inode.c +++ b/fs/ext2/inode.c | |||
@@ -799,6 +799,7 @@ int ext2_get_block(struct inode *inode, sector_t iblock, | |||
799 | static int ext2_iomap_begin(struct inode *inode, loff_t offset, loff_t length, | 799 | static int ext2_iomap_begin(struct inode *inode, loff_t offset, loff_t length, |
800 | unsigned flags, struct iomap *iomap) | 800 | unsigned flags, struct iomap *iomap) |
801 | { | 801 | { |
802 | struct block_device *bdev; | ||
802 | unsigned int blkbits = inode->i_blkbits; | 803 | unsigned int blkbits = inode->i_blkbits; |
803 | unsigned long first_block = offset >> blkbits; | 804 | unsigned long first_block = offset >> blkbits; |
804 | unsigned long max_blocks = (length + (1 << blkbits) - 1) >> blkbits; | 805 | unsigned long max_blocks = (length + (1 << blkbits) - 1) >> blkbits; |
@@ -812,8 +813,13 @@ static int ext2_iomap_begin(struct inode *inode, loff_t offset, loff_t length, | |||
812 | return ret; | 813 | return ret; |
813 | 814 | ||
814 | iomap->flags = 0; | 815 | iomap->flags = 0; |
815 | iomap->bdev = inode->i_sb->s_bdev; | 816 | bdev = inode->i_sb->s_bdev; |
817 | iomap->bdev = bdev; | ||
816 | iomap->offset = (u64)first_block << blkbits; | 818 | iomap->offset = (u64)first_block << blkbits; |
819 | if (blk_queue_dax(bdev->bd_queue)) | ||
820 | iomap->dax_dev = dax_get_by_host(bdev->bd_disk->disk_name); | ||
821 | else | ||
822 | iomap->dax_dev = NULL; | ||
817 | 823 | ||
818 | if (ret == 0) { | 824 | if (ret == 0) { |
819 | iomap->type = IOMAP_HOLE; | 825 | iomap->type = IOMAP_HOLE; |
@@ -835,6 +841,7 @@ static int | |||
835 | ext2_iomap_end(struct inode *inode, loff_t offset, loff_t length, | 841 | ext2_iomap_end(struct inode *inode, loff_t offset, loff_t length, |
836 | ssize_t written, unsigned flags, struct iomap *iomap) | 842 | ssize_t written, unsigned flags, struct iomap *iomap) |
837 | { | 843 | { |
844 | put_dax(iomap->dax_dev); | ||
838 | if (iomap->type == IOMAP_MAPPED && | 845 | if (iomap->type == IOMAP_MAPPED && |
839 | written < length && | 846 | written < length && |
840 | (flags & IOMAP_WRITE)) | 847 | (flags & IOMAP_WRITE)) |