Changeset 2bbbfd3 in mainline

Timestamp:

2011-04-05T19:28:23Z (14 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

7bd68e6

Parents:

af8ce880

Message:

Add functions to add or remove zones from inodes

Location:

uspace/srv/fs/minixfs

Files:

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

uspace/srv/fs/minixfs/mfs.h

@@ -163 +163 @@
 put_inode(struct mfs_node *mnode);
 
-/*mfs_read.c*/
-int read_map(uint32_t *b, const struct mfs_node *mnode, const uint32_t pos);
+/*mfs_rw.c*/
+extern int
+read_map(uint32_t *b, const struct mfs_node *mnode, const uint32_t pos);
+
+extern int
+write_map(struct mfs_node *mnode, uint32_t pos, uint32_t new_zone,
+                                uint32_t *old_zone);
+
+extern int
+free_zone(struct mfs_node *mnode, const uint32_t zone);
 
 /*mfs_dentry.c*/

uspace/srv/fs/minixfs/mfs_rw.c

@@ -1 +1 @@
 /*
+g
  * Copyright (c) 2011 Maurizio Lombardi
  * All rights reserved.
@@ -52 +53 @@
  *Returns zero if the block does not exist.
  */
-int read_map(uint32_t *b, const struct mfs_node *mnode, const uint32_t pos)
+int
+read_map(uint32_t *b, const struct mfs_node *mnode, uint32_t pos)
 {
         int r;
-
-        assert(mnode);
-        assert(mnode->instance);
-
         const struct mfs_sb_info *sbi = mnode->instance->sbi;
-        assert(sbi);
-
         const int block_size = sbi->block_size;
 
@@ -79 +75 @@
 }
 
+int
+write_map(struct mfs_node *mnode, const uint32_t pos, uint32_t new_zone, 
+                                uint32_t *old_zone)
+{
+        const struct mfs_sb_info *sbi = mnode->instance->sbi;
+        const int block_size = sbi->block_size;
+
+        /*Compute the relative block number in file*/
+        int rblock = pos / block_size;
+
+        return rw_map_ondisk(old_zone, mnode, rblock, true, new_zone);
+}
+
+int
+free_zone(struct mfs_node *mnode, const uint32_t zone)
+{
+        int r;
+        uint32_t old_zone;
+
+        r = rw_map_ondisk(&old_zone, mnode, zone, true, 0);
+        if (r != EOK)
+                return r;
+
+        if (old_zone > 0)
+                mfs_free_bit(mnode->instance, old_zone, BMAP_ZONE);
+
+        return EOK;
+}
+
 static int
 rw_map_ondisk(uint32_t *b, const struct mfs_node *mnode, int rblock,
@@ -98 +123 @@
         assert(sbi);
 
-        const int fs_version = sbi->fs_version;
+        const mfs_version_t fs_version = sbi->fs_version;
 
         if (fs_version == MFS_VERSION_V1) {
@@ -115 +140 @@
                         ino_i->dirty = true;
                 }
-                r = EOK;
-                goto out;
+                return EOK;
         }
         rblock -= nr_direct - 1;
@@ -127 +151 @@
                                 r = alloc_zone_and_clear(inst, &block);
                                 if (r != EOK)
-                                        goto out;
+                                        return r;
 
                                 ino_i->i_izone[0] = block;
                                 ino_i->dirty = true;
-                        } else {
-                                r = -1;
-                                goto out;
-                        }
+                        } else
+                                return -1;
                 }
 
@@ -140 +162 @@
                                 BLOCK_FLAGS_NONE);
                 if (r != EOK)
-                        goto out;
+                        return r;
 
                 if (fs_version == MFS_VERSION_V1) {
@@ -171 +193 @@
                         r = alloc_zone_and_clear(inst, &block);
                         if (r != EOK)
-                                goto out;
+                                return r;
 
                         ino_i->i_izone[1] = block;
                         ino_i->dirty = true;
-                } else {
-                        r = -1;
-                        goto out;
-                }
+                } else
+                        return -1;
         }
 
         r = block_get(&bi1, inst->handle, ino_i->i_izone[1],
                         BLOCK_FLAGS_NONE);
-
         if (r != EOK)
-                goto out;
+                return r;
 
         /*
@@ -203 +222 @@
                                 r = alloc_zone_and_clear(inst, &block);
                                 if (r != EOK)
-                                        goto out;
+                                        return r;
 
                                 blk = block;
                                 pt16[ind2_block] = conv16(sbi->native, blk);
                                 bi1->dirty = true;
-                        } else {
-                                r = -1;
-                                goto out;
-                        }
+                        } else
+                                return -1;
                 }
         
@@ -235 +252 @@
                                 r = alloc_zone_and_clear(inst, &block);
                                 if (r != EOK)
-                                        goto out;
+                                        return r;
 
                                 blk = block;
                                 pt32[ind2_block] = conv32(sbi->native, blk);
                                 bi1->dirty = true;
-                        } else {
-                                r = -1;
-                                goto out;
-                        }
+                        } else
+                                return -1;
                 }
         
@@ -264 +279 @@
 out_put_1:
         block_put(bi1);
-out:
         return r;
 }