Changeset 747a1e71 in mainline

Timestamp:

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

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

8c9e71a, e231d26

Parents:

ab545980 (diff), 36cb22f (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 from lp:mfs.

Location:

uspace/srv/fs/mfs

Files:

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

uspace/srv/fs/mfs/mfs_ops.c

@@ -143 +143 @@
 {
         enum cache_mode cmode;
-        struct mfs_superblock *sb;
-        struct mfs3_superblock *sb3;
-        struct mfs_sb_info *sbi;
-        struct mfs_instance *instance;
+        struct mfs_superblock *sb = NULL;
+        struct mfs3_superblock *sb3 = NULL;
+        struct mfs_sb_info *sbi = NULL;
+        struct mfs_instance *instance = NULL;
         bool native, longnames;
         mfs_version_t version;
@@ -166 +166 @@
         sbi = malloc(sizeof(*sbi));
         if (!sbi) {
-                block_fini(service_id);
-                return ENOMEM;
+                rc = ENOMEM;
+                goto out_error;
         }
 
@@ -173 +173 @@
         instance = malloc(sizeof(*instance));
         if (!instance) {
-                free(sbi);
-                block_fini(service_id);
-                return ENOMEM;
+                rc = ENOMEM;
+                goto out_error;
         }
 
         sb = malloc(MFS_SUPERBLOCK_SIZE);
         if (!sb) {
-                free(instance);
-                free(sbi);
-                block_fini(service_id);
-                return ENOMEM;
+                rc = ENOMEM;
+                goto out_error;
         }
 
         /* Read the superblock */
         rc = block_read_direct(service_id, MFS_SUPERBLOCK << 1, 2, sb);
-        if (rc != EOK) {
-                free(instance);
-                free(sbi);
-                free(sb);
-                block_fini(service_id);
-                return rc;
-        }
+        if (rc != EOK)
+                goto out_error;
 
         sb3 = (struct mfs3_superblock *) sb;
@@ -207 +199 @@
                 /*Not recognized*/
                 mfsdebug("magic number not recognized\n");
-                free(instance);
-                free(sbi);
-                free(sb);
-                block_fini(service_id);
-                return ENOTSUP;
+                rc = ENOTSUP;
+                goto out_error;
         }
 
@@ -256 +245 @@
                                     MFS_MAX_NAME_LEN;
         }
+
+        if (sbi->log2_zone_size != 0) {
+                /* In MFS, file space is allocated per zones.
+                 * Zones are a collection of consecutive blocks on disk.
+                 *
+                 * The current MFS implementation supports only filesystems
+                 * where the size of a zone is equal to the
+                 * size of a block.
+                 */
+                rc = ENOTSUP;
+                goto out_error;
+        }
+
         sbi->itable_off = 2 + sbi->ibmap_blocks + sbi->zbmap_blocks;
-
-        free(sb);
 
         rc = block_cache_init(service_id, sbi->block_size, 0, cmode);
         if (rc != EOK) {
-                free(instance);
-                free(sbi);
-                block_cache_fini(service_id);
-                block_fini(service_id);
                 mfsdebug("block cache initialization failed\n");
-                return EINVAL;
+                rc = EINVAL;
+                goto out_error;
         }
 
@@ -295 +292 @@
         *linkcnt = 1;
 
+        free(sb);
+
         return mfs_node_put(fn);
+
+out_error:
+        block_fini(service_id);
+        if (sb)
+                free(sb);
+        if (sbi)
+                free(sbi);
+        if(instance)
+                free(instance);
+        return rc;
 }
 
@@ -880 +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;
 
@@ -887 +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;
 
@@ -905 +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;
         }
 
@@ -916 +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;
 
@@ -925 +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;