Changeset 8bd5dad in mainline for uspace/lib/ext2/libext2_filesystem.c

Timestamp:

2011-02-13T21:20:21Z (13 years ago)

Author:

Martin Sucha <sucha14@…>

Branches:

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

Children:

c00e729

Parents:

566c401

Message:

Initialize libext2 in ext2info & fixed some bugs in libext2

File:

• uspace/lib/ext2/libext2_filesystem.c (modified) (4 diffs)

uspace/lib/ext2/libext2_filesystem.c

@@ -44 +44 @@
  * initializes libblock cache with appropriate logical block size.
  * 
- * @param fs Pointer to ext2_filesystem_t to initialize
- * @param devmap_handle Device handle of the block device
+ * @param fs                    Pointer to ext2_filesystem_t to initialize
+ * @param devmap_handle Device handle of the block device
  */
 int ext2_filesystem_init(ext2_filesystem_t *fs, devmap_handle_t devmap_handle)
@@ -51 +51 @@
         int rc;
         ext2_superblock_t *temp_superblock;
+        size_t block_size;
         
         fs->device = devmap_handle;
@@ -65 +66 @@
         }
         
-        free(temp_superblock);
+        block_size = ext2_superblock_get_block_size(temp_superblock);
+        
+        if (block_size > EXT2_MAX_BLOCK_SIZE) {
+                block_fini(fs->device);
+                return ENOTSUP;
+        }
+        
+        rc = block_cache_init(devmap_handle, block_size, 0, CACHE_MODE_WT);
+        if (rc != EOK) {
+                block_fini(fs->device);
+                return rc;
+        }
+        
+        fs->superblock = temp_superblock;
         
         return EOK; 
@@ -77 +91 @@
 void ext2_filesystem_fini(ext2_filesystem_t *fs)
 {
+        free(fs->superblock);
         block_fini(fs->device);
 }