Changeset 8f6bb76e in mainline

Timestamp:

2011-04-10T10:03: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:

230229de

Parents:

ce45f19

Message:

• Fix bug when allocating memory space for the indirect zone vector
• relative block number calculation was not correct

File:

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

uspace/srv/fs/minixfs/mfs_rw.c

@@ -69 +69 @@
         int rblock = pos / block_size;
 
-        if (mnode->ino_i->i_size < (int32_t) pos) {
+        if (mnode->ino_i->i_size < pos) {
                 /*Trying to read beyond the end of file*/
                 r = EOK;
@@ -147 +147 @@
                 return EOK;
         }
-        rblock -= nr_direct - 1;
+
+        rblock -= nr_direct;
 
         if (rblock < ptrs_per_block) {
@@ -160 +161 @@
                                 ino_i->i_izone[0] = zone;
                                 ino_i->dirty = true;
-                        } else
+                        } else {
                                 return -1;
+                        }
                 }
 
@@ -177 +179 @@
         }
 
-        rblock -= ptrs_per_block - 1;
+        rblock -= ptrs_per_block;
 
         /*The wanted block is in the double indirect zone chain*/
@@ -277 +279 @@
         unsigned i;
         block_t *b;
-
-        *ind_zone = malloc(sbi->block_size);
+        const int max_ind_zone_ptrs = (MFS_MAX_BLOCKSIZE / sizeof(uint16_t)) *
+                                sizeof(uint32_t);
+
+        *ind_zone = malloc(max_ind_zone_ptrs);
         if (*ind_zone == NULL)
                 return ENOMEM;