Changeset 9a0be34 in mainline

Timestamp:

2011-09-06T19:47:51Z (14 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

7a46bfe

Parents:

5e0427e8

Message:

mfs minor fixes:

• remove old asserts
• do not allow to write beyond the maximum file size
• fix a little bug when deleting sparse files

File:

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

uspace/srv/fs/minixfs/mfs_rw.c

@@ -83 +83 @@
         const struct mfs_sb_info *sbi = mnode->instance->sbi;
 
+        if (pos >= sbi->max_file_size) {
+                /*Can't write beyond the maximum file size*/
+                return EINVAL;
+        }
+
         /*Compute the relative block number in file*/
         int rblock = pos / sbi->block_size;
@@ -97 +102 @@
         uint32_t *ind_zone, *ind2_zone;
 
-        assert(mnode);
         struct mfs_ino_info *ino_i = mnode->ino_i;
-
-        assert(ino_i);
-        assert(mnode->instance);
-
         struct mfs_instance *inst = mnode->instance;
         struct mfs_sb_info *sbi = inst->sbi;
-        assert(sbi);
 
         const mfs_version_t fs_version = sbi->fs_version;
+        const bool deleting = write_mode && (w_block == 0);
 
         if (fs_version == MFS_VERSION_V1) {
@@ -132 +132 @@
                 /*The wanted block is in the single indirect zone chain*/
                 if (ino_i->i_izone[0] == 0) {
-                        if (write_mode) {
+                        if (write_mode && !deleting) {
                                 uint32_t zone;
                                 r = alloc_zone_and_clear(inst, &zone);
@@ -166 +166 @@
         /*read the first indirect zone of the chain*/
         if (ino_i->i_izone[1] == 0) {
-                if (write_mode) {
+                if (write_mode && !deleting) {
                         uint32_t zone;
                         r = alloc_zone_and_clear(inst, &zone);
@@ -193 +193 @@
         /*read the second indirect zone of the chain*/
         if (ind_zone[ind2_off] == 0) {
-                if (write_mode) {
+                if (write_mode && !deleting) {
                         uint32_t zone;
                         r = alloc_zone_and_clear(inst, &zone);