Changeset 038b289 in mainline for uspace/srv/fs/mfs/mfs_rw.c

Timestamp:

2011-09-06T23:34:35Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

888207c9, c05642d, c0e53ff

Parents:

7e9fce6 (diff), fb7e5a9a (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 MFS improvements from lp:mfs.

File:

• uspace/srv/fs/mfs/mfs_rw.c (moved) (moved from uspace/srv/fs/minixfs/mfs_rw.c ) (7 diffs)

uspace/srv/fs/mfs/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);
@@ -213 +213 @@
                 goto out_free_ind1;
 
-        *b = ind2_zone[ind2_off % ptrs_per_block];
+        *b = ind2_zone[rblock - (ind2_off * ptrs_per_block)];
         if (write_mode) {
-                ind2_zone[ind2_off % ptrs_per_block] = w_block;
+                ind2_zone[rblock - (ind2_off * ptrs_per_block)] = w_block;
                 write_ind_zone(inst, ind_zone[ind2_off], ind2_zone);
         }
@@ -371 +371 @@
         block_t *b;
 
-        r = block_get(&b, inst->service_id, zone, BLOCK_FLAGS_NONE);
+        r = block_get(&b, inst->service_id, zone, BLOCK_FLAGS_NOREAD);
         if (r != EOK)
                 return r;