Changeset cb747b3 in mainline

Timestamp:

2025-01-27T15:10:46Z (5 days ago)

Author:

Miroslav Cimerman <mc@…>

Children:

ea50e671

Parents:

eff458d

git-author:

Miroslav Cimerman <mc@…> (2025-01-25 18:23:55)

git-committer:

Miroslav Cimerman <mc@…> (2025-01-27 15:10:46)

Message:

ext4: support bigger blkdev block size

Allows ext4 to be used with block devices that have
block size > EXT4_SUPERBLOCK_SIZE (1K).

File:

• uspace/lib/ext4/src/superblock.c (modified) (2 diffs)

uspace/lib/ext4/src/superblock.c

@@ -1206 +1206 @@
 errno_t ext4_superblock_write_direct(service_id_t service_id, ext4_superblock_t *sb)
 {
+        void *tmp_sb = sb;
+
         /* Load physical block size from block device */
         size_t phys_block_size;
@@ -1216 +1218 @@
 
         /* Compute number of block to write */
-        size_t block_count = EXT4_SUPERBLOCK_SIZE / phys_block_size;
-
-        /* Check alignment */
-        if (EXT4_SUPERBLOCK_SIZE % phys_block_size)
-                block_count++;
+        size_t block_count;
+        if (phys_block_size <= EXT4_SUPERBLOCK_SIZE) {
+                block_count = EXT4_SUPERBLOCK_SIZE / phys_block_size;
+                /* Check alignment */
+                if (EXT4_SUPERBLOCK_SIZE % phys_block_size)
+                        block_count++;
+        } else {
+                block_count = 1;
+                tmp_sb = malloc(phys_block_size);
+                if (tmp_sb == NULL)
+                        return ENOMEM;
+                /* Preserve block data */
+                rc = block_read_direct(service_id, first_block, 1, tmp_sb);
+                if (rc != EOK) {
+                        free(tmp_sb);
+                        return rc;
+                }
+                void *sb_pos = (uint8_t *)tmp_sb + EXT4_SUPERBLOCK_OFFSET;
+                memcpy(sb_pos, sb, EXT4_SUPERBLOCK_SIZE);
+        }
 
         /* Write data */
-        return block_write_direct(service_id, first_block, block_count, sb);
+        rc = block_write_direct(service_id, first_block, block_count, tmp_sb);
+
+        if (phys_block_size > EXT4_SUPERBLOCK_SIZE)
+                free(tmp_sb);
+        return rc;
 }