Changeset b2a18234 in mainline

Timestamp:

2011-07-27T10:55:19Z (14 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

e8b6b6a

Parents:

88be951e

Message:

Remove the inode_grow() function and fix support to sparse files

Location:

uspace/srv/fs/minixfs

Files:

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

uspace/srv/fs/minixfs/mfs.h

@@ -195 +195 @@
 
 extern int
-inode_grow(struct mfs_node *mnode, size_t size_grow);
-
-extern int
 inode_shrink(struct mfs_node *mnode, size_t size_shrink);
 

uspace/srv/fs/minixfs/mfs_dentry.c

@@ -183 +183 @@
 
         if (!empty_dentry_found) {
-                r = inode_grow(mnode, sbi->dirsize);
+                uint32_t b, pos;
+                pos = mnode->ino_i->i_size;
+                r = read_map(&b, mnode, pos);
                 on_error(r, goto out);
+
+                if (b == 0) {
+                        /*Increase the inode size*/
+
+                        uint32_t dummy;
+                        r = mfs_alloc_zone(mnode->instance, &b);
+                        on_error(r, goto out);
+                        r = write_map(mnode, pos, b, &dummy);
+                        on_error(r, goto out);
+                }
+
+                mnode->ino_i->i_size += sbi->dirsize;
+                mnode->ino_i->dirty = true;
 
                 r = read_dentry(mnode, &d_info, i);

uspace/srv/fs/minixfs/mfs_inode.c

@@ -352 +352 @@
 }
 
-int
-inode_grow(struct mfs_node *mnode, size_t size_grow)
-{
-        unsigned i;
-        struct mfs_sb_info *sbi = mnode->instance->sbi;
-        struct mfs_ino_info *ino_i = mnode->ino_i;
-        const int bs = sbi->block_size;
-
-        const uint32_t old_size = ino_i->i_size;
-        const uint32_t new_size = old_size + size_grow;
-
-        assert(size_grow > 0);
-
-        /*Compute the number of zones to add to the inode*/
-        unsigned zones_to_add = 0;
-        if (old_size == 0)
-                ++zones_to_add;
-
-        zones_to_add += (new_size / bs) - (old_size / bs);
-
-        /*Compute the start zone*/
-        unsigned start_zone = old_size / bs;
-        start_zone += (old_size % bs) != 0;
-
-        int r;
-        for (i = 0; i < zones_to_add; ++i) {
-                uint32_t new_zone;
-                uint32_t dummy;
-
-                r = mfs_alloc_zone(mnode->instance, &new_zone);
-                on_error(r, return r);
-
-                block_t *b;
-                r = block_get(&b, mnode->instance->handle, new_zone,
-                              BLOCK_FLAGS_NOREAD);
-                on_error(r, return r);
-
-                memset(b->data, 0, bs);
-                b->dirty = true;
-                block_put(b);
-
-                r = write_map(mnode, (start_zone + i) * bs,
-                              new_zone, &dummy);
-
-                on_error(r, return r);
-
-                ino_i->i_size += bs;
-                ino_i->dirty = true;
-        }
-
-        ino_i->i_size = new_size;
-        ino_i->dirty = true;
-
-        return EOK;
-}
-
 /**
  * @}

uspace/srv/fs/minixfs/mfs_rw.c

@@ -135 +135 @@
                                 uint32_t zone;
                                 r = alloc_zone_and_clear(inst, &zone);
-                                if (r != EOK)
-                                        return r;
+                                on_error(r, return r);
 
                                 ino_i->i_izone[0] = zone;
                                 ino_i->dirty = true;
                         } else {
-                                return -1;
+                                /*Sparse block*/
+                                *b = 0;
+                                return EOK;
                         }
                 }
@@ -170 +171 @@
                         ino_i->i_izone[1] = zone;
                         ino_i->dirty = true;
-                } else
-                        return -1;
+                } else {
+                        /*Sparse block*/
+                        *b = 0;
+                        return EOK;
+                }
         }
 
@@ -193 +197 @@
                         write_ind_zone(inst, ino_i->i_izone[1], ind_zone);
                 } else {
-                        r = -1;
+                        /*Sparse block*/
+                        r = EOK;
+                        *b = 0;
                         goto out_free_ind1;
                 }