Changeset 1878386 in mainline

Timestamp:

2011-06-20T19:17: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:

01accb7

Parents:

1affcdf3

Message:

Add function to free unused indirect zones when a file is resized.
Use on_error() macro instead of if() else..

Location:

uspace/srv/fs/minixfs

Files:

• mfs.h (modified) (1 diff)
• mfs_inode.c (modified) (1 diff)
• mfs_rw.c (modified) (10 diffs)

uspace/srv/fs/minixfs/mfs.h

@@ -199 +199 @@
 free_zone(struct mfs_node *mnode, const uint32_t zone);
 
+extern int
+prune_ind_zones(struct mfs_node *mnode, size_t new_size);
+
 /*mfs_dentry.c*/
 extern int

uspace/srv/fs/minixfs/mfs_inode.c

@@ -343 +343 @@
 
         ino_i->i_size = new_size;
-        return EOK;
+
+        return prune_ind_zones(mnode, new_size);
 
 exit_error:

uspace/srv/fs/minixfs/mfs_rw.c

@@ -97 +97 @@
 
         r = rw_map_ondisk(&old_zone, mnode, zone, true, 0);
-        if (r != EOK)
-                return r;
+        on_error(r, return r);
 
         if (old_zone > 0)
@@ -163 +162 @@
 
                 r = read_ind_zone(inst, ino_i->i_izone[0], &ind_zone);
-                if (r != EOK)
-                        return r;
+                on_error(r, return r);
 
                 *b = ind_zone[rblock];
@@ -184 +182 @@
                         uint32_t zone;
                         r = alloc_zone_and_clear(inst, &zone);
-                        if (r != EOK)
-                                return r;
+                        on_error(r, return r);
 
                         ino_i->i_izone[1] = zone;
@@ -194 +191 @@
 
         r = read_ind_zone(inst, ino_i->i_izone[1], &ind_zone);
-        if (r != EOK)
-                return r;
+        on_error(r, return r);
 
         /*
@@ -208 +204 @@
                         uint32_t zone;
                         r = alloc_zone_and_clear(inst, &zone);
-                        if(r != EOK)
-                                goto out_free_ind1;
+                        on_error(r, goto out_free_ind1);
+
                         ind_zone[ind2_off] = zone;
                         write_ind_zone(inst, ino_i->i_izone[1], ind_zone);
@@ -219 +215 @@
 
         r = read_ind_zone(inst, ind_zone[ind2_off], &ind2_zone);
-        if (r != EOK)
-                goto out_free_ind1;
+        on_error(r, goto out_free_ind1);
 
         *b = ind2_zone[ind2_off % ptrs_per_block];
@@ -236 +231 @@
 }
 
+/*Free unused indirect zones*/
+int
+prune_ind_zones(struct mfs_node *mnode, size_t new_size)
+{
+        struct mfs_instance *inst = mnode->instance;
+        struct mfs_sb_info *sbi = inst->sbi;
+        struct mfs_ino_info *ino_i = mnode->ino_i;
+        int nr_direct, ptrs_per_block, rblock, r;
+        int i;
+
+        mfs_version_t fs_version = sbi->fs_version;
+        
+        if (fs_version == MFS_VERSION_V1) {
+                nr_direct = V1_NR_DIRECT_ZONES;
+                ptrs_per_block = MFS_BLOCKSIZE / sizeof(uint16_t);
+        } else {
+                nr_direct = V2_NR_DIRECT_ZONES;
+                ptrs_per_block = sbi->block_size / sizeof(uint32_t);
+        }
+
+        rblock = new_size / sbi->block_size;
+
+        if (rblock < nr_direct) {
+                /*free the single indirect zone*/
+                if (ino_i->i_izone[0]) {
+                        r = mfs_free_bit(inst, ino_i->i_izone[0], BMAP_ZONE);
+                        on_error(r, return r);
+
+                        ino_i->i_izone[0] = 0;
+                        ino_i->dirty = true;
+                }
+        }
+
+        rblock -= nr_direct + ptrs_per_block;
+
+        int fzone_to_free = (rblock < 0 ? 0 : rblock) / ptrs_per_block;
+
+        /*free the entire double indirect zone*/
+        uint32_t *dbl_zone;
+
+        r = read_ind_zone(inst, ino_i->i_izone[1], &dbl_zone);
+        on_error(r, return r);
+
+        for (i = fzone_to_free; i < ptrs_per_block; ++i) {
+                if (dbl_zone[i] == 0)
+                        continue;
+
+                r = mfs_free_bit(inst, dbl_zone[i], BMAP_ZONE);
+                on_error(r, return r);
+        }
+
+        if (fzone_to_free) {
+                r = mfs_free_bit(inst, ino_i->i_izone[1], BMAP_ZONE);
+                ino_i->i_izone[1] = 0;
+                ino_i->dirty = true;
+        }
+        free(dbl_zone);
+
+        return r;
+}
 
 static int
@@ -244 +299 @@
 
         r = block_get(&b, inst->handle, zone, BLOCK_FLAGS_NOREAD);
-        if (r != EOK)
-                return r;
+        on_error(r, return r);
 
         memset(b->data, 0, b->size);
@@ -260 +314 @@
 
         r = mfs_alloc_bit(inst, zone, BMAP_ZONE);
-        if (r != EOK)
-                goto out;
+        on_error(r, return r);
 
         r = reset_zone_content(inst, *zone);
-out:
         return r;
 }
@@ -314 +366 @@
 
         r = block_get(&b, inst->handle, zone, BLOCK_FLAGS_NONE);
-        if (r != EOK)
-                return r;
+        on_error(r, return r);
 
         if (sbi->fs_version == MFS_VERSION_V1) {