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/ext4/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/ext4/inode.c')
-rw-r--r-- | fs/ext4/inode.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c index 4247d8d25687..2cb2634daa99 100644 --- a/fs/ext4/inode.c +++ b/fs/ext4/inode.c | |||
@@ -3305,6 +3305,7 @@ static int ext4_releasepage(struct page *page, gfp_t wait) | |||
3305 | static int ext4_iomap_begin(struct inode *inode, loff_t offset, loff_t length, | 3305 | static int ext4_iomap_begin(struct inode *inode, loff_t offset, loff_t length, |
3306 | unsigned flags, struct iomap *iomap) | 3306 | unsigned flags, struct iomap *iomap) |
3307 | { | 3307 | { |
3308 | struct block_device *bdev; | ||
3308 | unsigned int blkbits = inode->i_blkbits; | 3309 | unsigned int blkbits = inode->i_blkbits; |
3309 | unsigned long first_block = offset >> blkbits; | 3310 | unsigned long first_block = offset >> blkbits; |
3310 | unsigned long last_block = (offset + length - 1) >> blkbits; | 3311 | unsigned long last_block = (offset + length - 1) >> blkbits; |
@@ -3373,7 +3374,12 @@ retry: | |||
3373 | } | 3374 | } |
3374 | 3375 | ||
3375 | iomap->flags = 0; | 3376 | iomap->flags = 0; |
3376 | iomap->bdev = inode->i_sb->s_bdev; | 3377 | bdev = inode->i_sb->s_bdev; |
3378 | iomap->bdev = bdev; | ||
3379 | if (blk_queue_dax(bdev->bd_queue)) | ||
3380 | iomap->dax_dev = dax_get_by_host(bdev->bd_disk->disk_name); | ||
3381 | else | ||
3382 | iomap->dax_dev = NULL; | ||
3377 | iomap->offset = first_block << blkbits; | 3383 | iomap->offset = first_block << blkbits; |
3378 | 3384 | ||
3379 | if (ret == 0) { | 3385 | if (ret == 0) { |
@@ -3406,6 +3412,7 @@ static int ext4_iomap_end(struct inode *inode, loff_t offset, loff_t length, | |||
3406 | int blkbits = inode->i_blkbits; | 3412 | int blkbits = inode->i_blkbits; |
3407 | bool truncate = false; | 3413 | bool truncate = false; |
3408 | 3414 | ||
3415 | put_dax(iomap->dax_dev); | ||
3409 | if (!(flags & IOMAP_WRITE) || (flags & IOMAP_FAULT)) | 3416 | if (!(flags & IOMAP_WRITE) || (flags & IOMAP_FAULT)) |
3410 | return 0; | 3417 | return 0; |
3411 | 3418 | ||