Skip to contentSkip to conversation

erofs: scan devices from device table

PATCH In review Jeffle Xu 2 participants 2 messages May 12, 2022 EROFS file system

lore
Share & tools
lore

Jeffle Xu

author
#0 lore raw

PATCH v2 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.

---
changes since v1:
tweak the error warning when device tag is empty

---
 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
index 1238ca104f09..1adde3a813b4 100644
@@ -37,12 +37,9 @@
 #define EROFS_SB_EXTSLOT_SIZE	16
 
 struct 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
#1 lore raw
Quoted 9 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.

---
changes since v1:
tweak the error warning when device tag is empty

Thanks! will push out today.

Thanks,
Gao Xiang