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

uspace/srv/fs/mfs/mfs_rw.c

@@ -53 +53 @@
  *bytes, this function returns the on-disk block
  *relative to that position.
- *Returns zero if the block does not exist.
+ *
+ * @param b     Pointer to a 32bit number where the block number will be stored
+ * @param mnode Pointer to a generic MINIX inode in memory.
+ * @param pos   Position in file.
+ *
+ * @return      EOK on success or a negative error code.
  */
 int
@@ -227 +232 @@
 }
 
-/*Free unused indirect zones*/
+/**Free unused indirect zones from a MINIX inode according to it's new size.
+ *
+ * @param mnode         Pointer to a generic MINIX inode in memory.
+ * @param new_size      The new size of the inode.
+ *
+ * @return              EOK on success or a negative error code.
+ */
 int
 mfs_prune_ind_zones(struct mfs_node *mnode, size_t new_size)
@@ -239 +250 @@
         mfs_version_t fs_version = sbi->fs_version;
         
+        assert(new_size <= ino_i->i_size);
+
         if (fs_version == MFS_VERSION_V1) {
                 nr_direct = V1_NR_DIRECT_ZONES;