Changeset eefb653 in mainline for uspace/srv/fs/minixfs/mfs_ops.c

Timestamp:

2011-07-30T18:14:31Z (13 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

7a2be00

Parents:

6f7e0cd

Message:

mfs_destroy_node() should call mfs_node_put() even in case of error.

File:

• uspace/srv/fs/minixfs/mfs_ops.c (modified) (2 diffs)

uspace/srv/fs/minixfs/mfs_ops.c

@@ -1011 +1011 @@
 
         r = mfs_has_children(&has_children, fn);
-        on_error(r, return r);
+        on_error(r, goto out);
 
         assert(!has_children);
@@ -1023 +1023 @@
         /*Free the entire inode content*/
         r = inode_shrink(mnode, mnode->ino_i->i_size);
-        on_error(r, return r);
+        on_error(r, goto out);
         r = mfs_free_inode(mnode->instance, mnode->ino_i->index);
-        on_error(r, return r);
-        r = mfs_node_put(fn);
-        on_error(r, return r);
+        on_error(r, goto out);
 
 out:
+        mfs_node_put(fn);
         return r;
 }