Changeset 1e65444 in mainline for uspace/srv/fs/ext4fs/ext4fs_ops.c

Timestamp:

2011-11-09T17:52:33Z (14 years ago)

Author:

Frantisek Princ <frantisek.princ@…>

Branches:

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

Children:

2b9e142

Parents:

35f48f2

Message:

more functional file writing - indirect blocks too

File:

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

uspace/srv/fs/ext4fs/ext4fs_ops.c

@@ -926 +926 @@
     size_t *wbytes, aoff64_t *nsize)
 {
-        EXT4FS_DBG("");
-
         int rc;
         int flags = BLOCK_FLAGS_NONE;
@@ -966 +964 @@
         }
 
-        EXT4FS_DBG("bytes == \%u", bytes);
+//      EXT4FS_DBG("bytes == \%u", bytes);
 
         iblock =  pos / block_size;
@@ -973 +971 @@
 
         if (fblock == 0) {
-                EXT4FS_DBG("Allocate block !!!");
+//              EXT4FS_DBG("Allocate block !!!");
                 rc =  ext4_bitmap_alloc_block(fs, inode_ref, &fblock);
                 if (rc != EOK) {
@@ -981 +979 @@
                 }
 
-                ext4_filesystem_set_inode_data_block_index(fs, inode_ref->inode, iblock, fblock);
+                ext4_filesystem_set_inode_data_block_index(fs, inode_ref, iblock, fblock);
                 inode_ref->dirty = true;
 
                 flags = BLOCK_FLAGS_NOREAD;
 
-                EXT4FS_DBG("block \%u allocated", fblock);
+//              EXT4FS_DBG("block \%u allocated", fblock);
         }
 
@@ -996 +994 @@
         }
 
-        EXT4FS_DBG("block loaded");
-
         if (flags == BLOCK_FLAGS_NOREAD) {
-                EXT4FS_DBG("fill block with zeros");
+//              EXT4FS_DBG("fill block with zeros");
                 memset(write_block->data, 0, block_size);
         }
@@ -1005 +1001 @@
         rc = async_data_write_finalize(callid, write_block->data + (pos % block_size), bytes);
         if (rc != EOK) {
+                // TODO error
                 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;
 
@@ -1022 +1013 @@
         }
 
-        EXT4FS_DBG("writing finished");
+//      EXT4FS_DBG("writing finished");
 
         old_inode_size = ext4_inode_get_size(fs->superblock, inode_ref->inode);