Changeset 35f48f2 in mainline for uspace/srv/fs/ext4fs/ext4fs_ops.c

Timestamp:

2011-11-09T08:48:06Z (12 years ago)

Author:

Frantisek Princ <frantisek.princ@…>

Branches:

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

Children:

1e65444

Parents:

0f09d4ea

Message:

succesful writing (only for direct block)

File:

• uspace/srv/fs/ext4fs/ext4fs_ops.c (modified) (7 diffs)

uspace/srv/fs/ext4fs/ext4fs_ops.c

@@ -929 +929 @@
 
         int rc;
+        int flags = BLOCK_FLAGS_NONE;
         fs_node_t *fn;
         ext4fs_node_t *enode;
@@ -937 +938 @@
         block_t *write_block;
         uint32_t fblock, iblock;
+        uint32_t old_inode_size;
 
         rc = ext4fs_node_get(&fn, service_id, index);
@@ -960 +962 @@
         bytes = min(len, block_size - (pos % block_size));
 
+        if (bytes == block_size) {
+                flags = BLOCK_FLAGS_NOREAD;
+        }
+
         EXT4FS_DBG("bytes == \%u", bytes);
 
@@ -966 +972 @@
         rc = ext4_filesystem_get_inode_data_block_index(fs, inode_ref->inode, iblock, &fblock);
 
-
-        // TODO allocation if fblock == 0
         if (fblock == 0) {
                 EXT4FS_DBG("Allocate block !!!");
-
-                return ENOTSUP;
-        }
-
-        // TODO flags
-        rc = block_get(&write_block, service_id, fblock, 0);
+                rc =  ext4_bitmap_alloc_block(fs, inode_ref, &fblock);
+                if (rc != EOK) {
+                        ext4fs_node_put(fn);
+                        async_answer_0(callid, rc);
+                        return rc;
+                }
+
+                ext4_filesystem_set_inode_data_block_index(fs, inode_ref->inode, iblock, fblock);
+                inode_ref->dirty = true;
+
+                flags = BLOCK_FLAGS_NOREAD;
+
+                EXT4FS_DBG("block \%u allocated", fblock);
+        }
+
+        rc = block_get(&write_block, service_id, fblock, flags);
         if (rc != EOK) {
                 ext4fs_node_put(fn);
@@ -982 +996 @@
         }
 
-        /*
-        if (flags == BLOCK_FLAGS_NOREAD)
-                memset(b->data, 0, sbi->block_size);
-        */
-
-        async_data_write_finalize(callid, write_block->data + (pos % block_size), bytes);
+        EXT4FS_DBG("block loaded");
+
+        if (flags == BLOCK_FLAGS_NOREAD) {
+                EXT4FS_DBG("fill block with zeros");
+                memset(write_block->data, 0, block_size);
+        }
+
+        rc = async_data_write_finalize(callid, write_block->data + (pos % block_size), bytes);
+        if (rc != EOK) {
+                EXT4FS_DBG("error in write finalize \%d", rc);
+        }
+
+        char *data = write_block->data + (pos % block_size);
+        for (uint32_t x = 0; x < bytes; ++x) {
+                printf("%c", data[x]);
+        }
+        printf("\n");
+
         write_block->dirty = true;
 
@@ -996 +1022 @@
         }
 
-        /*
-        if (pos + bytes > ino_i->i_size) {
-                ino_i->i_size = pos + bytes;
-                ino_i->dirty = true;
-        }
-        *nsize = ino_i->i_size;
+        EXT4FS_DBG("writing finished");
+
+        old_inode_size = ext4_inode_get_size(fs->superblock, inode_ref->inode);
+        if (pos + bytes > old_inode_size) {
+                ext4_inode_set_size(inode_ref->inode, pos + bytes);
+                inode_ref->dirty = true;
+        }
+
+        *nsize = ext4_inode_get_size(fs->superblock, inode_ref->inode);
         *wbytes = bytes;
-        */
+
         return ext4fs_node_put(fn);
 }
@@ -1105 +1134 @@
 static int ext4fs_sync(service_id_t service_id, fs_index_t index)
 {
-        EXT4FS_DBG("not supported");
-
-        // TODO
-        return ENOTSUP;
+        EXT4FS_DBG("");
+
+        int rc;
+        fs_node_t *fn;
+        ext4fs_node_t *enode;
+
+        rc = ext4fs_node_get(&fn, service_id, index);
+        if (rc != EOK) {
+                return rc;
+        }
+
+        enode = EXT4FS_NODE(fn);
+        enode->inode_ref->dirty = true;
+
+        return ext4fs_node_put(fn);
 }