erofs: scan devices from device table
PATCH 1/1 erofs: scan devices from device table
When "-o device" mount option is not specified, scan the device table and instantiate the devices if there's any in the device table. In this case, the tag field of each device slot uniquely specifies a device.
Signed-off-by Jeffle Xu <[email protected]>
--- fs/erofs/erofs_fs.h | 9 ++-- fs/erofs/super.c | 102 ++++++++++++++++++++++++++++++-------------- 2 files changed, 72 insertions(+), 39 deletions(-)
fs/erofs/erofs_fs.h +3 -6
@@ -37,12 +37,9 @@#define EROFS_SB_EXTSLOT_SIZE 16struct erofs_deviceslot { -union { -u8 uuid[16 ];/* used for device manager later */ -u8 userdata[64 ];/* digest(sha256), etc. */ - } u; -__le32 blocks;/* total fs blocks of this device */ -__le32 mapped_blkaddr;/* map starting at mapped_blkaddr */ +u8 tag[64 ];/* digest(sha256), etc. */ +__le32 blocks;/* total fs blocks of this device */ +__le32 mapped_blkaddr;/* map starting at mapped_blkaddr */ u8 reserved[56 ]; };#define EROFS_DEVT_SLOT_SIZE sizeof(struct erofs_deviceslot)
fs/erofs/super.c +69 -33
137 lines not on this page · raw message
Signature · 1 line
2.27.0
Quoted 46 lines · Jeffle Xu
When "-o device" mount option is not specified, scan the device table and instantiate the devices if there's any in the device table. In this case, the tag field of each device slot uniquely specifies a device.
Signed-off-by Jeffle Xu <[email protected]>--- fs/erofs/erofs_fs.h | 9 ++-- fs/erofs/super.c | 102 ++++++++++++++++++++++++++++++-------------- 2 files changed, 72 insertions(+), 39 deletions(-)fs/erofs/erofs_fs.h +3
-6@@ -37,12 +37,9 @@#define EROFS_SB_EXTSLOT_SIZE 16struct erofs_deviceslot { -union { -u8 uuid[16 ];/* used for device manager later */ -u8 userdata[64 ];/* digest(sha256), etc. */ - } u; -__le32 blocks;/* total fs blocks of this device */ -__le32 mapped_blkaddr;/* map starting at mapped_blkaddr */ +u8 tag[64 ];/* digest(sha256), etc. */ +__le32 blocks;/* total fs blocks of this device */ +__le32 mapped_blkaddr;/* map starting at mapped_blkaddr */ u8 reserved[56 ]; };#define EROFS_DEVT_SLOT_SIZE sizeof(struct erofs_deviceslot)fs/erofs/super.c +7
-1@@ -219,7 +219,52 @@ static int erofs_load_compr_cfgs(struct super_block *sb, }#endif -static int erofs_init_devices(struct super_block *sb, +static int erofs_init_device (struct erofs_buf *buf,struct super_block *sb, +struct erofs_device_info *dif,erofs_off_t *pos) +{ +struct erofs_sb_info *sbi =EROFS_SB (sb); +struct erofs_deviceslot *dis; +struct block_device *bdev; +void *ptr;
fs/erofs/super.c static int erofs_load_compr_cfgs(struct super_block *sb, · line 238
Quoted 10 lines
fs/erofs/super.c +10
-0+int ret; + + ptr =erofs_read_metabuf (buf, sb,erofs_blknr (*pos),EROFS_KMAP ); +if (IS_ERR (ptr)) +return PTR_ERR (ptr); + dis = ptr +erofs_blkoff (*pos); + +if (!dif->path) { +if (!dis->tag[0 ]) { +erofs_err (sb,"Empty digest data (pos %llu)" , *pos);
erofs_err(sb, "empty tag @ pos %llu", *pos);
?
Otherwise it looks good to me,
Reviewed-by Gao Xiang <[email protected]>
Thanks,
Gao Xiang