Changeset 38b7233 in mainline

Timestamp:

2011-06-26T10:08:18Z (14 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

a5bad72

Parents:

d8af1bd

Message:

Fix bug in the inode_shrink() function, zones_to_free was not correctly computed.

File:

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

uspace/srv/fs/minixfs/mfs_inode.c

@@ -317 +317 @@
 
         /*Compute the number of zones to free*/
-        unsigned zones_to_free = 0;
-        if (new_size == 0)
-                ++zones_to_free;
-
-        zones_to_free += (old_size / bs) - (new_size / bs);
-
-        mfsdebug("zones to free = %u\n", zones_to_free);
+        unsigned zones_to_free;
+
+        size_t diff = old_size - new_size;
+        zones_to_free = diff / bs;
+
+        if (diff % bs != 0)
+                zones_to_free++;
 
         uint32_t pos = old_size - 1;
@@ -374 +374 @@
         start_zone += (old_size % bs) != 0;
 
-        mfsdebug("zones to add = %u\n", zones_to_add);
-
         int r;
         for (i = 0; i < zones_to_add; ++i) {
@@ -384 +382 @@
                 on_error(r, return r);
 
-                mfsdebug("write_map = %d\n", (int) ((start_zone + i) * bs));
-
                 block_t *b;
                 r = block_get(&b, mnode->instance->handle, new_zone,