Changeset c699b0c in mainline for uspace/srv/fs/minixfs/mfs_inode.c

Timestamp:

2011-09-04T13:12:33Z (13 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

3a5ee6c

Parents:

03bc76a

Message:

remove the on_error() macro

File:

• uspace/srv/fs/minixfs/mfs_inode.c (modified) (6 diffs)

uspace/srv/fs/minixfs/mfs_inode.c

@@ -96 +96 @@
                       itable_off + inum / sbi->ino_per_block,
                       BLOCK_FLAGS_NONE);
-        on_error(r, goto out_err);
+        if (r != EOK)
+                goto out_err;
 
         ino = b->data + ino_off * sizeof(struct mfs_inode);
@@ -152 +153 @@
                       itable_off + inum / sbi->ino_per_block,
                       BLOCK_FLAGS_NONE);
-        on_error(r, goto out_err);
+        if (r != EOK)
+                goto out_err;
 
         ino = b->data + ino_off * sizeof(struct mfs2_inode);
@@ -225 +227 @@
                       BLOCK_FLAGS_NONE);
 
-        on_error(r, goto out);
+        if (r != EOK)
+                goto out;
 
         struct mfs_inode *ino = b->data;
@@ -267 +270 @@
                       BLOCK_FLAGS_NONE);
 
-        on_error(r, goto out);
+        if (r != EOK)
+                goto out;
 
         struct mfs2_inode *ino2 = b->data;
@@ -330 +334 @@
 
                 r = write_map(mnode, pos, 0, &old_zone);
-                on_error(r, goto exit_error);
+                if (r != EOK)
+                        goto exit_error;
 
                 ino_i->i_size -= bs;
@@ -338 +343 @@
 
                 r = mfs_free_zone(mnode->instance, old_zone);
-                on_error(r, goto exit_error);
+                if (r != EOK)
+                        goto exit_error;
         }