Changeset 432a269 in mainline for uspace/srv/fs/mfs/mfs_inode.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_inode.c (modified) (6 diffs)

uspace/srv/fs/mfs/mfs_inode.c

@@ -48 +48 @@
                 struct mfs_ino_info **ino_ptr, uint32_t inum);
 
-
+/**Read a MINIX inode from disk
+ *
+ * @param inst          Pointer to the filesystem instance.
+ * @param ino_i         Pointer to the generic MINIX inode
+ *                      where the inode content will be stored.
+ * @param index         index of the inode to read.
+ *
+ * @return              EOK on success or a negative error code.
+ */
 int
 mfs_get_inode(struct mfs_instance *inst, struct mfs_ino_info **ino_i,
@@ -77 +85 @@
 
         sbi = instance->sbi;
-        assert(sbi);
 
         /*inode 0 does not exist*/
@@ -142 +149 @@
 
         sbi = instance->sbi;
-        assert(sbi);
 
         /*inode 0 does not exist*/
@@ -185 +191 @@
 }
 
+/**Write a MINIX inode on disk (if marked as dirty)
+ *
+ * @param mnode         Pointer to the generic MINIX inode in memory.
+ *
+ * @return              EOK on success or a negative error code.
+ */
 int
-mfs_put_inode_core(struct mfs_node *mnode)
+mfs_put_inode(struct mfs_node *mnode)
 {
         int rc = EOK;
-
-        assert(mnode);
-        assert(mnode->ino_i);
 
         if (!mnode->ino_i->dirty)
@@ -197 +206 @@
 
         struct mfs_instance *inst = mnode->instance;
-        assert(inst);
         struct mfs_sb_info *sbi = inst->sbi;
-        assert(sbi);
 
         if (sbi->fs_version == MFS_VERSION_V1)
@@ -299 +306 @@
 }
 
+/**Reduce the inode size of a given number of bytes
+ *
+ * @param mnode         Pointer to the generic MINIX inode in memory.
+ * @param size_shrink   Number of bytes that will be subtracted to the inode.
+ *
+ * @return              EOK on success or a negative error code.
+ */
 int
 mfs_inode_shrink(struct mfs_node *mnode, size_t size_shrink)