Changeset 64e63ce1 in mainline

Timestamp:

2013-07-11T09:35:48Z (11 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

1ba6651

Parents:

4c53333

Message:

mfs: try to restore a consistent filesystem status in case of error

Location:

uspace/srv/fs/mfs

Files:

• mfs_balloc.c (modified) (1 diff)
• mfs_dentry.c (modified) (1 diff)
• mfs_ops.c (modified) (3 diffs)

uspace/srv/fs/mfs/mfs_balloc.c

@@ -202 +202 @@
                 start_block = 2;
                 nblocks = sbi->ibmap_blocks;
-                limit = sbi->ninodes;
+                limit = sbi->ninodes - 1;
         }
         bits_per_block = sbi->block_size * 8;

uspace/srv/fs/mfs/mfs_dentry.c

@@ -240 +240 @@
                                 goto out;
                         r = mfs_write_map(mnode, pos, b, &dummy);
-                        if (r != EOK)
+                        if (r != EOK) {
+                                mfs_free_zone(mnode->instance, b);
                                 goto out;
+                        }
                 }
 

uspace/srv/fs/mfs/mfs_ops.c

@@ -419 +419 @@
         free(ino_i);
 out_err:
+        mfs_free_inode(inst, inum);
         return r;
 }
@@ -674 +675 @@
                 r = mfs_insert_dentry(child, "..", parent->ino_i->index);
                 if (r != EOK) {
+                        mfs_remove_dentry(child, ".");
                         destroy_dentry = true;
                         goto exit;
@@ -925 +927 @@
                 
                 r = mfs_write_map(mnode, pos, block, &dummy);
-                if (r != EOK)
+                if (r != EOK) {
+                        mfs_free_zone(mnode->instance, block);
                         goto out_err;
+                }
 
                 flags = BLOCK_FLAGS_NOREAD;