This patch implements the data plane of reading data from data blob file
over fscache.
Signed-off-by: Jeffle Xu <jefflexu@xxxxxxxxxxxxxxxxx>
---
fs/erofs/data.c | 3 +++
fs/erofs/fscache.c | 15 ++++++++++++---
fs/erofs/internal.h | 1 +
3 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/fs/erofs/data.c b/fs/erofs/data.c
index 51ccbc02dd73..56db391a3411 100644
--- a/fs/erofs/data.c
+++ b/fs/erofs/data.c
@@ -200,6 +200,7 @@ int erofs_map_dev(struct super_block *sb, struct erofs_map_dev *map)
map->m_bdev = sb->s_bdev;
map->m_daxdev = EROFS_SB(sb)->dax_dev;
map->m_dax_part_off = EROFS_SB(sb)->dax_part_off;
+ map->m_ctx = EROFS_SB(sb)->bootstrap;
if (map->m_deviceid) {
down_read(&devs->rwsem);
@@ -211,6 +212,7 @@ int erofs_map_dev(struct super_block *sb, struct erofs_map_dev *map)
map->m_bdev = dif->bdev;
map->m_daxdev = dif->dax_dev;
map->m_dax_part_off = dif->dax_part_off;
+ map->m_ctx = dif->ctx;
up_read(&devs->rwsem);
} else if (devs->extra_devices) {
down_read(&devs->rwsem);
@@ -228,6 +230,7 @@ int erofs_map_dev(struct super_block *sb, struct erofs_map_dev *map)
map->m_bdev = dif->bdev;
map->m_daxdev = dif->dax_dev;
map->m_dax_part_off = dif->dax_part_off;
+ map->m_ctx = dif->ctx;
break;
}
}
diff --git a/fs/erofs/fscache.c b/fs/erofs/fscache.c
index 8c56bd54b2af..e8df35ee4ba8 100644
--- a/fs/erofs/fscache.c
+++ b/fs/erofs/fscache.c
@@ -144,8 +144,8 @@ static int erofs_fscache_readpage(struct file *file, struct page *page)
struct inode *inode = page->mapping->host;
struct erofs_inode *vi = EROFS_I(inode);
struct super_block *sb = inode->i_sb;
- struct erofs_sb_info *sbi = EROFS_SB(sb);
struct erofs_map_blocks map;
+ struct erofs_map_dev mdev;
struct erofs_fscache_map fsmap;
int ret;
@@ -168,9 +168,18 @@ static int erofs_fscache_readpage(struct file *file, struct page *page)
return 0;
}
- fsmap.m_ctx = sbi->bootstrap;
+ mdev = (struct erofs_map_dev) {
+ .m_deviceid = map.m_deviceid,
+ .m_pa = map.m_pa,
+ };
+
+ ret = erofs_map_dev(sb, &mdev);
+ if (ret)
+ return ret;
+
+ fsmap.m_ctx = mdev.m_ctx;
fsmap.m_la = map.m_la;
- fsmap.m_pa = map.m_pa;
+ fsmap.m_pa = mdev.m_pa;
fsmap.m_llen = map.m_llen;
switch (vi->datalayout) {
diff --git a/fs/erofs/internal.h b/fs/erofs/internal.h
index 5d514c7b73cc..6ccf14952b2d 100644
--- a/fs/erofs/internal.h
+++ b/fs/erofs/internal.h
@@ -486,6 +486,7 @@ struct erofs_map_dev {
struct block_device *m_bdev;
struct dax_device *m_daxdev;
u64 m_dax_part_off;
+ struct erofs_fscache_context *m_ctx;
erofs_off_t m_pa;
unsigned int m_deviceid;
--
2.27.0
--
Linux-cachefs mailing list
Linux-cachefs@xxxxxxxxxx
https://listman.redhat.com/mailman/listinfo/linux-cachefs
