Changeset e5cebc9 in mainline

Timestamp:

2011-04-19T20:59:51Z (14 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

bfbe16f

Parents:

1494e52

Message:

Fixes to inode_grow():

• The number of zones to add to the inode was not correct.
• The new zone content should be set at zero.

File:

• uspace/srv/fs/minixfs/mfs_inode.c (modified) (4 diffs)

uspace/srv/fs/minixfs/mfs_inode.c

@@ -323 +323 @@
         /*Compute the number of zones to add to the inode*/
         unsigned zones_to_add = 0;
-        if ((old_size % (bs - 1)) == 0)
-                zones_to_add++;
-
-        zones_to_add += (new_size - old_size) / bs;
+        if (old_size == 0)
+                ++zones_to_add;
+
+        zones_to_add += (new_size / bs) - (old_size / bs);
 
         /*Compute the start zone*/
@@ -333 +333 @@
 
         mfsdebug("zones to add = %u\n", zones_to_add);
-
-        if (zones_to_add == 0) {
-                /*Set the new inode size and exit*/
-                ino_i->i_size = new_size;
-                ino_i->dirty = true;
-                return EOK;
-        }
 
         int r;
@@ -350 +343 @@
                         return r;
 
-                r = write_map(mnode, (start_zone + i) * sbi->block_size,
+                mfsdebug("write_map = %d\n", (int) ((start_zone + i) * bs));
+
+                block_t *b;
+                r = block_get(&b, mnode->instance->handle, new_zone,
+                                                BLOCK_FLAGS_NOREAD);
+                if (r != EOK)
+                        return r;
+
+                memset(b->data, 0, bs);
+                b->dirty = true;
+                block_put(b);
+
+                r = write_map(mnode, (start_zone + i) * bs,
                                 new_zone, &dummy);
                 if (r != EOK)
@@ -358 +363 @@
                 ino_i->dirty = true;
         }
+
+        ino_i->i_size = new_size;
+        ino_i->dirty = true;
+
         return EOK;
 }