vfs: remove obsolete 'drive' field from fat_mount and ext2_mount (P5.2)

diff --git a/include/ext2.h b/include/ext2.h
index c878fac75c7d0256fd90ca152cbabb9927ba809b..592a1e13640e86dfa6028de29074403f3831b83a 100644 (file)
--- a/include/ext2.h
+++ b/include/ext2.h
@@ -19,7 +19,6 @@ struct ext2_group_desc;
 /* Per-mount filesystem state */
 struct ext2_mount {
     const block_device_t* bdev;
-    int      drive;
     uint32_t part_lba;        /* partition start LBA */
     uint32_t block_size;      /* bytes per block (1024, 2048, or 4096) */
     uint32_t sectors_per_block;

diff --git a/include/fat.h b/include/fat.h
index eb5f886ed122a2955f8dec2ebc9c9439eac5f863..ca774a008e0c9778c69da9ea23726b79d2868748 100644 (file)
--- a/include/fat.h
+++ b/include/fat.h
@@ -23,7 +23,6 @@ enum fat_type {
 /* Per-mount filesystem state */
 struct fat_mount {
     const block_device_t* bdev;
-    int      drive;
     uint32_t part_lba;
     uint16_t bytes_per_sector;
     uint8_t  sectors_per_cluster;

diff --git a/src/kernel/ext2.c b/src/kernel/ext2.c
index 829401d361532bc2dbc9b37a553858dfb11cba42..05b2a54a0dedac26c318ee59125eb40c58b4cee6 100644 (file)
--- a/src/kernel/ext2.c
+++ b/src/kernel/ext2.c
@@ -1444,7 +1444,6 @@ vfs_mount_result_t ext2_mount(const block_device_t* bdev, uint32_t partition_lba
     memset(em, 0, sizeof(*em));
 
     em->bdev = bdev;
-    em->drive = bdev->drive_id;
     em->part_lba = partition_lba;
 
     struct ext2_superblock sb;

diff --git a/src/kernel/fat.c b/src/kernel/fat.c
index cbcf5b4b307f49389fe1aa325b24978b50e67434..ebf7afbad3ae5aa0e0c8a77668766e8529bb6ff0 100644 (file)
--- a/src/kernel/fat.c
+++ b/src/kernel/fat.c
@@ -1150,7 +1150,6 @@ vfs_mount_result_t fat_mount(const block_device_t* bdev, uint32_t partition_lba)
     memset(fm, 0, sizeof(*fm));
 
     fm->bdev = bdev;
-    fm->drive = bdev->drive_id;
 
     uint8_t boot_sec[FAT_SECTOR_SIZE];
     if (fat_read_sector(fm, partition_lba, boot_sec) < 0) {