Changeset f455de0 in mainline

Timestamp:

2025-02-13T20:22:38Z (2 days ago)

Author:

GitHub <noreply@…>

Parents:

32254d6 (diff), 4a3a5a0 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Miroslav Cimerman <70661600+mcimerman@…> (2025-02-13 20:22:38)

git-committer:

GitHub <noreply@…> (2025-02-13 20:22:38)

Message:

Merge 4a3a5a0bef135a6de53fbdafff893157b3296753 into 32254d6ae36aa180fa53338ca60684a9c87d7947

File:

• uspace/lib/ext4/src/superblock.c (modified) (1 diff)

uspace/lib/ext4/src/superblock.c

@@ -1215 +1215 @@
         uint64_t first_block = EXT4_SUPERBLOCK_OFFSET / phys_block_size;
 
-        /* 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++;
-
-        /* Write data */
-        return block_write_direct(service_id, first_block, block_count, sb);
+        if (phys_block_size <= EXT4_SUPERBLOCK_SIZE) {
+                /* Superblock is a multiple of physical block sizes */
+                size_t block_count = EXT4_SUPERBLOCK_SIZE / phys_block_size;
+                return block_write_direct(service_id, first_block, block_count, sb);
+        }
+
+        /*
+         * Superblock fills only a part of the physical block,
+         * but we can only overwrite an entire physical block.
+         */
+        void *tmp_sb = malloc(phys_block_size);
+        if (tmp_sb == NULL)
+                return ENOMEM;
+
+        /* Preserve physical block data */
+        rc = block_read_direct(service_id, first_block, 1, tmp_sb);
+        if (rc == EOK) {
+                /* Write the superblock */
+                void *sb_pos = tmp_sb + EXT4_SUPERBLOCK_OFFSET % phys_block_size;
+                memcpy(sb_pos, sb, EXT4_SUPERBLOCK_SIZE);
+
+                /* Write physical block to device */
+                rc = block_write_direct(service_id, first_block, 1, tmp_sb);
+        }
+
+        free(tmp_sb);
+        return rc;
 }