Changeset b84175a in mainline

Timestamp:

2011-03-11T18:33:29Z (14 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

14c29ba

Parents:

0dd2717

Message:

Fix wrong use of block_write_direct(), make sure we write at least 1k per block

File:

• uspace/app/mkminix/mkminix.c (modified) (10 diffs)

uspace/app/mkminix/mkminix.c

@@ -97 +97 @@
 static void     mark_bmap(uint32_t *bmap, int idx, int v);
 static int      insert_dentries(const struct mfs_sb_info *sb);
+
+static inline int write_1k_block(aoff64_t off, size_t size, const void *data);
 
 static devmap_handle_t handle;
@@ -310 +312 @@
         }
 
-        rc = block_write_direct(handle, root_dblock, 1, root_block);
+        rc = write_1k_block(root_dblock, 1, root_block);
 
         free(root_block);
@@ -338 +340 @@
 
         for (i = 0; i < itable_size; ++i, ++itable_off) {
-                rc = block_write_direct(handle, itable_off, 1, itable_buf);
+                rc = write_1k_block(itable_off, 1, itable_buf);
 
                 if (rc != EOK)
@@ -374 +376 @@
         ino_buf[MFS_ROOT_INO].i_dzone[0] = sb->first_data_zone;
 
-        rc = block_write_direct(handle, itable_off, 1, ino_buf);
+        rc = write_1k_block(itable_off, 1, ino_buf);
 
         free(ino_buf);
@@ -411 +413 @@
         ino_buf[MFS_ROOT_INO].i_dzone[0] = sb->first_data_zone;
 
-        rc = block_write_direct(handle, itable_off, 1, ino_buf);
+        rc = write_1k_block(itable_off, 1, ino_buf);
 
         free(ino_buf);
@@ -516 +518 @@
         sb->s_state = MFS_VALID_FS;
 
-        rc = block_write_direct(handle, MFS_SUPERBLOCK, 1, sb);
+        rc = write_1k_block(MFS_SUPERBLOCK, 1, sb);
         free(sb);
 
@@ -543 +545 @@
         sb->s_disk_version = 3;
 
-        rc = block_write_direct(handle, MFS_SUPERBLOCK, 1, sb);
+        rc = write_1k_block(MFS_SUPERBLOCK, 1, sb);
         free(sb);
 
@@ -583 +585 @@
 
         for (i = 0; i < ibmap_nblocks; ++i) {
-                if ((rc = block_write_direct(handle, start_block + i,
+                if ((rc = write_1k_block(start_block + i,
                                 1, (ibmap_buf8 + i * MFS_BLOCKSIZE))) != EOK)
                         return rc;
@@ -591 +593 @@
 
         for (i = 0; i < zbmap_nblocks; ++i) {
-                if ((rc = block_write_direct(handle, start_block + i,
+                if ((rc = write_1k_block(start_block + i,
                                 1, (zbmap_buf8 + i * MFS_BLOCKSIZE))) != EOK)
                         return rc;
@@ -608 +610 @@
         else
                 bmap[idx / 32] |= 1 << (idx % 32);
+}
+
+static inline int write_1k_block(aoff64_t off, size_t size, const void *data)
+{
+        return block_write_direct(handle, off * 2, size * 2, data);     
 }