diff options
| author |  Christoph Hellwig <hch@lst.de>
| 2021-11-29 11:21:59 +0100 |
|---|---|---|
| committer |  Dan Williams <dan.j.williams@intel.com>
| 2021-12-04 08:58:54 -0800 |
| commit | cd913c76f489def1a388e3a5b10df94948ede3f5 (patch) | |
| tree | d144a96b23dd0ea4064702c2f5e06d4fe6258680 /fs/erofs | |
| parent | iomap: add a IOMAP_DAX flag (diff) | |
| download | linux-cd913c76f489def1a388e3a5b10df94948ede3f5.tar.gz linux-cd913c76f489def1a388e3a5b10df94948ede3f5.tar.bz2 linux-cd913c76f489def1a388e3a5b10df94948ede3f5.zip | |
dax: return the partition offset from fs_dax_get_by_bdev
Prepare for the removal of the block_device from the DAX I/O path by
returning the partition offset from fs_dax_get_by_bdev so that the file
systems have it at hand for use during I/O.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Dan Williams <dan.j.williams@intel.com>
Reviewed-by: Darrick J. Wong <djwong@kernel.org>
Link: https://lore.kernel.org/r/20211129102203.2243509-26-hch@lst.de
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Diffstat (limited to 'fs/erofs')
| -rw-r--r-- | fs/erofs/internal.h | 2 | ||||
| -rw-r--r-- | fs/erofs/super.c | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/fs/erofs/internal.h b/fs/erofs/internal.h index 3265688af7f9..c1e65346e9f1 100644 --- a/fs/erofs/internal.h +++ b/fs/erofs/internal.h @@ -51,6 +51,7 @@ struct erofs_device_info { char *path; struct block_device *bdev; struct dax_device *dax_dev; + u64 dax_part_off; u32 blocks; u32 mapped_blkaddr; @@ -109,6 +110,7 @@ struct erofs_sb_info { #endif /* CONFIG_EROFS_FS_ZIP */ struct erofs_dev_context *devs; struct dax_device *dax_dev; + u64 dax_part_off; u64 total_blocks; u32 primarydevice_blocks; diff --git a/fs/erofs/super.c b/fs/erofs/super.c index 0aed886473c8..71efce16024d 100644 --- a/fs/erofs/super.c +++ b/fs/erofs/super.c @@ -312,7 +312,7 @@ static int erofs_init_devices(struct super_block *sb, goto err_out; } dif->bdev = bdev; - dif->dax_dev = fs_dax_get_by_bdev(bdev); + dif->dax_dev = fs_dax_get_by_bdev(bdev, &dif->dax_part_off); dif->blocks = le32_to_cpu(dis->blocks); dif->mapped_blkaddr = le32_to_cpu(dis->mapped_blkaddr); sbi->total_blocks += dif->blocks; @@ -644,7 +644,7 @@ static int erofs_fc_fill_super(struct super_block *sb, struct fs_context *fc) sb->s_fs_info = sbi; sbi->opt = ctx->opt; - sbi->dax_dev = fs_dax_get_by_bdev(sb->s_bdev); + sbi->dax_dev = fs_dax_get_by_bdev(sb->s_bdev, &sbi->dax_part_off); sbi->devs = ctx->devs; ctx->devs = NULL; |