Changeset 432a269 in mainline for uspace/srv/fs/mfs/mfs_ops.c

Timestamp:

2011-09-16T21:13:57Z (13 years ago)

Author:

Martin Sucha <sucha14@…>

Branches:

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

Children:

3a11f17

Parents:

c0e53ff (diff), fd07e526 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes

File:

• uspace/srv/fs/mfs/mfs_ops.c (modified) (3 diffs)

uspace/srv/fs/mfs/mfs_ops.c

@@ -468 +468 @@
 static aoff64_t mfs_size_get(fs_node_t *node)
 {
-        assert(node);
-
         const struct mfs_node *mnode = node->data;
-        assert(mnode);
-        assert(mnode->ino_i);
-
         return mnode->ino_i->i_size;
 }
@@ -513 +508 @@
                 assert(mnode->instance->open_nodes_cnt > 0);
                 mnode->instance->open_nodes_cnt--;
-                rc = mfs_put_inode_core(mnode);
+                rc = mfs_put_inode(mnode);
                 free(mnode->ino_i);
                 free(mnode);
@@ -535 +530 @@
 {
         struct mfs_node *mnode = fsnode->data;
-
-        assert(mnode->ino_i);
         return mnode->ino_i->index;
 }