Changeset 01accb7 in mainline for uspace/srv/fs/minixfs/mfs_rw.c

Timestamp:

2011-06-20T19:25:37Z (13 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

c955be91

Parents:

1878386

Message:

Fix some bugs when freeing unused double indirect zones

File:

• uspace/srv/fs/minixfs/mfs_rw.c (modified) (2 diffs)

uspace/srv/fs/minixfs/mfs_rw.c

@@ -268 +268 @@
         int fzone_to_free = (rblock < 0 ? 0 : rblock) / ptrs_per_block;
 
+        if ((fzone_to_free % ptrs_per_block) != 0)
+                ++fzone_to_free;
+
         /*free the entire double indirect zone*/
         uint32_t *dbl_zone;
+
+        if (ino_i->i_izone[1] == 0) {
+                /*Nothing to be done*/
+                return EOK;
+        }
 
         r = read_ind_zone(inst, ino_i->i_izone[1], &dbl_zone);
@@ -282 +290 @@
         }
 
-        if (fzone_to_free) {
+        if (fzone_to_free == 0) {
                 r = mfs_free_bit(inst, ino_i->i_izone[1], BMAP_ZONE);
                 ino_i->i_izone[1] = 0;