Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-25 21:51:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

erofs: port device access to file

Browse Source 
Link: https://lore.kernel.org/r/20240123-vfs-bdev-file-v2-20-adbd023e19cc@kernel.org
Reviewed-by: Jan Kara <jack@suse.cz>
Signed-off-by: Christian Brauner <brauner@kernel.org>
This commit is contained in:
Christian Brauner 2024-01-23 14:26:37 +01:00
parent 9ae061cf2a
commit 87b355f448
No known key found for this signature in database
GPG Key ID: 91C61BC06578DCA2
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
fs/erofs/data.c
View File

@ -220,7 +220,7 @@ int erofs_map_dev(struct super_block *sb, struct erofs_map_dev *map)
up_read(&devs->rwsem); up_read(&devs->rwsem);
return 0; return 0;
} }
map->m_bdev = dif->bdev_handle ? dif->bdev_handle->bdev : NULL; map->m_bdev = dif->bdev_file ? file_bdev(dif->bdev_file) : NULL;
map->m_daxdev = dif->dax_dev; map->m_daxdev = dif->dax_dev;
map->m_dax_part_off = dif->dax_part_off; map->m_dax_part_off = dif->dax_part_off;
map->m_fscache = dif->fscache; map->m_fscache = dif->fscache;
@ -238,8 +238,8 @@ int erofs_map_dev(struct super_block *sb, struct erofs_map_dev *map)
if (map->m_pa >= startoff && if (map->m_pa >= startoff &&
map->m_pa < startoff + length) { map->m_pa < startoff + length) {
map->m_pa -= startoff; map->m_pa -= startoff;
map->m_bdev = dif->bdev_handle ? map->m_bdev = dif->bdev_file ?
dif->bdev_handle->bdev : NULL; file_bdev(dif->bdev_file) : NULL;
map->m_daxdev = dif->dax_dev; map->m_daxdev = dif->dax_dev;
map->m_dax_part_off = dif->dax_part_off; map->m_dax_part_off = dif->dax_part_off;
map->m_fscache = dif->fscache; map->m_fscache = dif->fscache;

2
fs/erofs/internal.h
View File

@ -49,7 +49,7 @@ typedef u32 erofs_blk_t;
struct erofs_device_info { struct erofs_device_info {
char *path; char *path;
struct erofs_fscache *fscache; struct erofs_fscache *fscache;
struct bdev_handle *bdev_handle; struct file *bdev_file;
struct dax_device *dax_dev; struct dax_device *dax_dev;
u64 dax_part_off; u64 dax_part_off;

16
fs/erofs/super.c
View File

@ -177,7 +177,7 @@ static int erofs_init_device(struct erofs_buf *buf, struct super_block *sb,
struct erofs_sb_info *sbi = EROFS_SB(sb); struct erofs_sb_info *sbi = EROFS_SB(sb);
struct erofs_fscache *fscache; struct erofs_fscache *fscache;
struct erofs_deviceslot *dis; struct erofs_deviceslot *dis;
struct bdev_handle *bdev_handle; struct file *bdev_file;
void *ptr; void *ptr;
ptr = erofs_read_metabuf(buf, sb, erofs_blknr(sb, *pos), EROFS_KMAP); ptr = erofs_read_metabuf(buf, sb, erofs_blknr(sb, *pos), EROFS_KMAP);
@ -201,12 +201,12 @@ static int erofs_init_device(struct erofs_buf *buf, struct super_block *sb,
return PTR_ERR(fscache); return PTR_ERR(fscache);
dif->fscache = fscache; dif->fscache = fscache;
} else if (!sbi->devs->flatdev) { } else if (!sbi->devs->flatdev) {
bdev_handle = bdev_open_by_path(dif->path, BLK_OPEN_READ, bdev_file = bdev_file_open_by_path(dif->path, BLK_OPEN_READ,
sb->s_type, NULL); sb->s_type, NULL);
if (IS_ERR(bdev_handle)) if (IS_ERR(bdev_file))
return PTR_ERR(bdev_handle); return PTR_ERR(bdev_file);
dif->bdev_handle = bdev_handle; dif->bdev_file = bdev_file;
dif->dax_dev = fs_dax_get_by_bdev(bdev_handle->bdev, dif->dax_dev = fs_dax_get_by_bdev(file_bdev(bdev_file),
&dif->dax_part_off, NULL, NULL); &dif->dax_part_off, NULL, NULL);
} }
@ -754,8 +754,8 @@ static int erofs_release_device_info(int id, void *ptr, void *data)
struct erofs_device_info *dif = ptr; struct erofs_device_info *dif = ptr;
fs_put_dax(dif->dax_dev, NULL); fs_put_dax(dif->dax_dev, NULL);
if (dif->bdev_handle) if (dif->bdev_file)
bdev_release(dif->bdev_handle); fput(dif->bdev_file);
erofs_fscache_unregister_cookie(dif->fscache); erofs_fscache_unregister_cookie(dif->fscache);
dif->fscache = NULL; dif->fscache = NULL;
kfree(dif->path); kfree(dif->path);