Changeset 0b293a6 in mainline

Timestamp:

2012-07-21T08:58:29Z (12 years ago)

Author:

Frantisek Princ <frantisek.princ@…>

Branches:

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

Children:

7deca26

Parents:

fe61181

Message:

added variable cache mode + missing cache fini

Location:

uspace

Files:

• lib/ext4/libext4_filesystem.c (modified) (4 diffs)
• lib/ext4/libext4_filesystem.h (modified) (1 diff)
• srv/fs/ext4fs/ext4fs_ops.c (modified) (1 diff)

uspace/lib/ext4/libext4_filesystem.c

@@ -47 +47 @@
  * @return                                      error code
  */
-int ext4_filesystem_init(ext4_filesystem_t *fs, service_id_t service_id)
+int ext4_filesystem_init(ext4_filesystem_t *fs, service_id_t service_id,
+                enum cache_mode cmode)
 {
         int rc;
@@ -75 +76 @@
 
         /* Initialize block caching by libblock */
-        rc = block_cache_init(service_id, block_size, 0, CACHE_MODE_WB);
+        rc = block_cache_init(service_id, block_size, 0, cmode);
         if (rc != EOK) {
                 block_fini(fs->device);
@@ -136 +137 @@
 
         /* Finish work with block library */
+        block_cache_fini(fs->device);
         block_fini(fs->device);
 
@@ -878 +880 @@
         inode_ref->dirty = true;
 
+        /* Free block with extended attributes if present */
+        uint32_t xattr_block = ext4_inode_get_file_acl(
+                        inode_ref->inode, fs->superblock);
+        if (xattr_block) {
+                rc = ext4_balloc_free_block(inode_ref, xattr_block);
+                if (rc != EOK) {
+                        return rc;
+                }
+
+                ext4_inode_set_file_acl(inode_ref->inode, fs->superblock, 0);
+        }
+
         /* Free inode by allocator */
         if (ext4_inode_is_type(fs->superblock, inode_ref->inode,

uspace/lib/ext4/libext4_filesystem.h

@@ -37 +37 @@
 #include "libext4_types.h"
 
-extern int ext4_filesystem_init(ext4_filesystem_t *, service_id_t);
+extern int ext4_filesystem_init(ext4_filesystem_t *,
+                service_id_t, enum cache_mode);
 extern int ext4_filesystem_fini(ext4_filesystem_t *fs);
 extern int ext4_filesystem_check_sanity(ext4_filesystem_t *fs);

uspace/srv/fs/ext4fs/ext4fs_ops.c

@@ -910 +910 @@
         }
 
+        enum cache_mode cmode;
+        if (str_cmp(opts, "wtcache") == 0) {
+                cmode = CACHE_MODE_WT;
+        } else {
+                cmode = CACHE_MODE_WB;
+        }
+
         /* Initialize the filesystem */
-        rc = ext4_filesystem_init(fs, service_id);
+        rc = ext4_filesystem_init(fs, service_id, cmode);
         if (rc != EOK) {
                 free(fs);