Skip to content

Commit fa5d932

Browse files
committed
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 <[email protected]>
1 parent 817bf40 commit fa5d932

File tree

4 files changed

+27
-2
lines changed

4 files changed

+27
-2
lines changed

fs/ext2/inode.c

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -799,6 +799,7 @@ int ext2_get_block(struct inode *inode, sector_t iblock,
799799
static int ext2_iomap_begin(struct inode *inode, loff_t offset, loff_t length,
800800
unsigned flags, struct iomap *iomap)
801801
{
802+
struct block_device *bdev;
802803
unsigned int blkbits = inode->i_blkbits;
803804
unsigned long first_block = offset >> blkbits;
804805
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,
812813
return ret;
813814

814815
iomap->flags = 0;
815-
iomap->bdev = inode->i_sb->s_bdev;
816+
bdev = inode->i_sb->s_bdev;
817+
iomap->bdev = bdev;
816818
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;
817823

818824
if (ret == 0) {
819825
iomap->type = IOMAP_HOLE;
@@ -835,6 +841,7 @@ static int
835841
ext2_iomap_end(struct inode *inode, loff_t offset, loff_t length,
836842
ssize_t written, unsigned flags, struct iomap *iomap)
837843
{
844+
put_dax(iomap->dax_dev);
838845
if (iomap->type == IOMAP_MAPPED &&
839846
written < length &&
840847
(flags & IOMAP_WRITE))

fs/ext4/inode.c

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3305,6 +3305,7 @@ static int ext4_releasepage(struct page *page, gfp_t wait)
33053305
static int ext4_iomap_begin(struct inode *inode, loff_t offset, loff_t length,
33063306
unsigned flags, struct iomap *iomap)
33073307
{
3308+
struct block_device *bdev;
33083309
unsigned int blkbits = inode->i_blkbits;
33093310
unsigned long first_block = offset >> blkbits;
33103311
unsigned long last_block = (offset + length - 1) >> blkbits;
@@ -3373,7 +3374,12 @@ static int ext4_iomap_begin(struct inode *inode, loff_t offset, loff_t length,
33733374
}
33743375

33753376
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;
33773383
iomap->offset = first_block << blkbits;
33783384

33793385
if (ret == 0) {
@@ -3406,6 +3412,7 @@ static int ext4_iomap_end(struct inode *inode, loff_t offset, loff_t length,
34063412
int blkbits = inode->i_blkbits;
34073413
bool truncate = false;
34083414

3415+
put_dax(iomap->dax_dev);
34093416
if (!(flags & IOMAP_WRITE) || (flags & IOMAP_FAULT))
34103417
return 0;
34113418

fs/xfs/xfs_iomap.c

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -976,6 +976,7 @@ xfs_file_iomap_begin(
976976
int nimaps = 1, error = 0;
977977
bool shared = false, trimmed = false;
978978
unsigned lockmode;
979+
struct block_device *bdev;
979980

980981
if (XFS_FORCED_SHUTDOWN(mp))
981982
return -EIO;
@@ -1063,6 +1064,14 @@ xfs_file_iomap_begin(
10631064
}
10641065

10651066
xfs_bmbt_to_iomap(ip, iomap, &imap);
1067+
1068+
/* optionally associate a dax device with the iomap bdev */
1069+
bdev = iomap->bdev;
1070+
if (blk_queue_dax(bdev->bd_queue))
1071+
iomap->dax_dev = dax_get_by_host(bdev->bd_disk->disk_name);
1072+
else
1073+
iomap->dax_dev = NULL;
1074+
10661075
if (shared)
10671076
iomap->flags |= IOMAP_F_SHARED;
10681077
return 0;
@@ -1140,6 +1149,7 @@ xfs_file_iomap_end(
11401149
unsigned flags,
11411150
struct iomap *iomap)
11421151
{
1152+
put_dax(iomap->dax_dev);
11431153
if ((flags & IOMAP_WRITE) && iomap->type == IOMAP_DELALLOC)
11441154
return xfs_file_iomap_end_delalloc(XFS_I(inode), offset,
11451155
length, written, iomap);

include/linux/iomap.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ struct iomap {
4141
u16 type; /* type of mapping */
4242
u16 flags; /* flags for mapping */
4343
struct block_device *bdev; /* block device for I/O */
44+
struct dax_device *dax_dev; /* dax_dev for dax operations */
4445
};
4546

4647
/*

0 commit comments

Comments
 (0)