Changeset c699b0c in mainline for uspace/srv/fs/minixfs/mfs_ops.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_ops.c (modified) (15 diffs)

uspace/srv/fs/minixfs/mfs_ops.c

@@ -335 +335 @@
 
         r = mfs_instance_get(service_id, &inst);
-        on_error(r, return r);
+        if (r != EOK)
+                return r;
 
         /*Alloc a new inode*/
         r = mfs_alloc_inode(inst, &inum);
-        on_error(r, return r);
+        if (r != EOK)
+                return r;
 
         struct mfs_ino_info *ino_i;
@@ -432 +434 @@
         for (i = 0; i < mnode->ino_i->i_size / sbi->dirsize; ++i) {
                 r = read_dentry(mnode, &d_info, i);
-                on_error(r, return r);
+                if (r != EOK)
+                        return r;
 
                 if (!d_info.d_inum) {
@@ -475 +478 @@
 
         rc = mfs_instance_get(service_id, &instance);
-        on_error(rc, return rc);
+        if (rc != EOK)
+                return rc;
 
         return mfs_node_core_get(rfn, instance, index);
@@ -583 +587 @@
 
         rc = get_inode(inst, &ino_i, index);
-        on_error(rc, goto out_err);
+        if (rc != EOK)
+                goto out_err;
 
         ino_i->index = index;
@@ -641 +646 @@
 
         int r = insert_dentry(parent, name, child->ino_i->index);
-        on_error(r, goto exit_error);
+        if (r != EOK)
+                goto exit_error;
 
         if (S_ISDIR(child->ino_i->i_mode)) {
                 r = insert_dentry(child, ".", child->ino_i->index);
-                on_error(r, goto exit_error);
+                if (r != EOK)
+                        goto exit_error;
                 //child->ino_i->i_nlinks++;
                 //child->ino_i->dirty = true;
                 r = insert_dentry(child, "..", parent->ino_i->index);
-                on_error(r, goto exit_error);
+                if (r != EOK)
+                        goto exit_error;
                 //parent->ino_i->i_nlinks++;
                 //parent->ino_i->dirty = true;
@@ -672 +680 @@
 
         r = mfs_has_children(&has_children, cfn);
-        on_error(r, return r);
+        if (r != EOK)
+                return r;
 
         if (has_children)
@@ -678 +687 @@
 
         r = remove_dentry(parent, name);
-        on_error(r, return r);
+        if (r != EOK)
+                return r;
 
         struct mfs_ino_info *chino = child->ino_i;
@@ -713 +723 @@
         for (i = 2; i < mnode->ino_i->i_size / sbi->dirsize; ++i) {
                 r = read_dentry(mnode, &d_info, i);
-                on_error(r, return r);
+                if (r != EOK)
+                        return r;
 
                 if (d_info.d_inum) {
@@ -764 +775 @@
                 for (; pos < mnode->ino_i->i_size / sbi->dirsize; ++pos) {
                         rc = read_dentry(mnode, &d_info, pos);
-                        on_error(rc, goto out_error);
+                        if (rc != EOK)
+                                goto out_error;
 
                         if (d_info.d_inum) {
@@ -796 +808 @@
 
                 rc = read_map(&zone, mnode, pos);
-                on_error(rc, goto out_error);
+                if (rc != EOK)
+                        goto out_error;
 
                 if (zone == 0) {
@@ -813 +826 @@
 
                 rc = block_get(&b, service_id, zone, BLOCK_FLAGS_NONE);
-                on_error(rc, goto out_error);
+                if (rc != EOK)
+                        goto out_error;
 
                 async_data_read_finalize(callid, b->data +
@@ -870 +884 @@
         if (pos < boundary) {
                 r = read_map(&block, mnode, pos);
-                on_error(r, goto out_err);
+                if (r != EOK)
+                        goto out_err;
 
                 if (block == 0) {
                         /*Writing in a sparse block*/
                         r = mfs_alloc_zone(mnode->instance, &block);
-                        on_error(r, goto out_err);
+                        if (r != EOK)
+                                goto out_err;
                         flags = BLOCK_FLAGS_NOREAD;
                 }
@@ -882 +898 @@
 
                 r = mfs_alloc_zone(mnode->instance, &block);
-                on_error(r, goto out_err);
+                if (r != EOK)
+                        goto out_err;
 
                 r = write_map(mnode, pos, block, &dummy);
-                on_error(r, goto out_err);
+                if (r != EOK)
+                        goto out_err;
         }
 
         block_t *b;
         r = block_get(&b, service_id, block, flags);
-        on_error(r, goto out_err);
+        if (r != EOK)
+                goto out_err;
 
         async_data_write_finalize(callid, b->data + pos % bs, bytes);
@@ -941 +960 @@
 
         r = mfs_has_children(&has_children, fn);
-        on_error(r, goto out);
+        if (r != EOK)
+                goto out;
 
         assert(!has_children);
@@ -953 +973 @@
         /*Free the entire inode content*/
         r = inode_shrink(mnode, mnode->ino_i->i_size);
-        on_error(r, goto out);
+        if (r != EOK)
+                goto out;
         r = mfs_free_inode(mnode->instance, mnode->ino_i->index);