Changes in uspace/srv/fs/mfs/mfs_rw.c [7a46bfe:36cb22f] in mainline

File:

• uspace/srv/fs/mfs/mfs_rw.c (modified) (5 diffs)

uspace/srv/fs/mfs/mfs_rw.c

@@ -31 +31 @@
  */
 
+#include <align.h>
 #include "mfs.h"
 
@@ -53 +54 @@
  *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
@@ -65 +71 @@
         int rblock = pos / block_size;
 
-        if (mnode->ino_i->i_size < pos) {
+        if (ROUND_UP(mnode->ino_i->i_size, sbi->block_size) < pos) {
                 /*Trying to read beyond the end of file*/
                 r = EOK;
@@ -227 +233 @@
 }
 
-/*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 +251 @@
         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;