Changeset 8bd5dad in mainline

Timestamp:

2011-02-13T21:20:21Z (14 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

Location:

uspace

Files:

• app/ext2info/ext2info.c (modified) (3 diffs)
• lib/ext2/Makefile (modified) (1 diff)
• lib/ext2/libext2.h (modified) (1 diff)
• lib/ext2/libext2_filesystem.c (modified) (4 diffs)
• lib/ext2/libext2_superblock.c (modified) (1 diff)

uspace/app/ext2info/ext2info.c

@@ -60 +60 @@
         char *dev_path;
         devmap_handle_t handle;
-        ext2_superblock_t *superblock;
+        ext2_filesystem_t filesystem;
         
         uint16_t magic;
@@ -86 +86 @@
         }
 
-        rc = block_init(handle, 2048);
+        rc = ext2_filesystem_init(&filesystem, handle);
         if (rc != EOK)  {
-                printf(NAME ": Error initializing libblock.\n");
-                return 2;
-        }
-
-        rc = ext2_superblock_read_direct(handle, &superblock);
-        if (rc != EOK)  {
-                printf(NAME ": Error reading superblock.\n");
+                printf(NAME ": Error initializing libext2.\n");
                 return 3;
         }
         
         printf("Superblock:\n");
-        magic = ext2_superblock_get_magic(superblock);
+        magic = ext2_superblock_get_magic(filesystem.superblock);
         if (magic == EXT2_SUPERBLOCK_MAGIC) {
                 printf("  Magic value: %X (correct)\n", magic);
@@ -106 +100 @@
                 printf("  Magic value: %X (incorrect)\n", magic);
         }
-        
-        
-        free(superblock);
 
-        block_fini(handle);
+        ext2_filesystem_fini(&filesystem);
 
         return 0;

uspace/lib/ext2/Makefile

@@ -32 +32 @@
 LIBRARY = libext2
 EXTRA_CFLAGS = -I$(LIBBLOCK_PREFIX)
+LIBS = $(LIBBLOCK_PREFIX)/libblock.a
 
 SOURCES = \

uspace/lib/ext2/libext2.h

@@ -67 +67 @@
 #define EXT2_SUPERBLOCK_LAST_BYTE       (EXT2_SUPERBLOCK_OFFSET + \
                                                                          EXT2_SUPERBLOCK_SIZE -1)
+// allow maximum this block size
+#define EXT2_MAX_BLOCK_SIZE                     8096
 
 inline uint16_t ext2_superblock_get_magic(ext2_superblock_t *);

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);
 }

uspace/lib/ext2/libext2_superblock.c

@@ -79 +79 @@
 inline uint32_t ext2_superblock_get_block_size(ext2_superblock_t *sb)
 {
-        return 1024 << ext2_superblock_get_block_size(sb);
+        return 1024 << ext2_superblock_get_block_size_log2(sb);
 }