Changeset 36cb22f in mainline

Timestamp:

2011-09-27T13:01:54Z (13 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

5726a1a3, 747a1e71

Parents:

1db44ea

Message:

fix a bug in the mfs_write() and mfs_read_map() functions.

• mfs_read_map(): the inode size must be rounded up to the block size before testing

if "pos" is beyond the end of file.

• mfs_write(): fix inode size calculation and set BLOCK_FLAGS_NOREAD when a new block is allocated.

Location:

uspace/srv/fs/mfs

Files:

• mfs_ops.c (modified) (5 diffs)
• mfs_rw.c (modified) (2 diffs)

uspace/srv/fs/mfs/mfs_ops.c

@@ -889 +889 @@
         struct mfs_ino_info *ino_i = mnode->ino_i;
         const size_t bs = sbi->block_size;
-        size_t bytes = min(len, bs - pos % bs);
-        size_t boundary = ROUND_UP(ino_i->i_size, bs);
+        size_t bytes = min(len, bs - (pos % bs));
         uint32_t block;
 
@@ -896 +895 @@
                 flags = BLOCK_FLAGS_NOREAD;
 
-        if (pos < boundary) {
-                r = mfs_read_map(&block, mnode, pos);
-                if (r != EOK)
-                        goto out_err;
-
-                if (block == 0) {
-                        /*Writing in a sparse block*/
-                        r = mfs_alloc_zone(mnode->instance, &block);
-                        if (r != EOK)
-                                goto out_err;
-                        flags = BLOCK_FLAGS_NOREAD;
-                }
-        } else {
+        r = mfs_read_map(&block, mnode, pos);
+        if (r != EOK)
+                goto out_err;
+
+        if (block == 0) {
+                /*Writing in a sparse block*/
                 uint32_t dummy;
 
@@ -914 +906 @@
                 if (r != EOK)
                         goto out_err;
-
+                
                 r = mfs_write_map(mnode, pos, block, &dummy);
                 if (r != EOK)
                         goto out_err;
+
+                flags = BLOCK_FLAGS_NOREAD;
         }
 
@@ -925 +919 @@
                 goto out_err;
 
-        async_data_write_finalize(callid, b->data + pos % bs, bytes);
+        if (flags == BLOCK_FLAGS_NOREAD)
+                memset(b->data, 0, sbi->block_size);
+
+        async_data_write_finalize(callid, b->data + (pos % bs), bytes);
         b->dirty = true;
 
@@ -934 +931 @@
         }
 
-        ino_i->i_size = pos + bytes;
-        ino_i->dirty = true;
+        if (pos + bytes > ino_i->i_size) {
+                ino_i->i_size = pos + bytes;
+                ino_i->dirty = true;
+        }
         r = mfs_node_put(fn);
-        *nsize = pos + bytes;
+        *nsize = ino_i->i_size;
         *wbytes = bytes;
         return r;

uspace/srv/fs/mfs/mfs_rw.c

@@ -31 +31 @@
  */
 
+#include <align.h>
 #include "mfs.h"
 
@@ -70 +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;