Changeset cd00f93 in mainline

Timestamp:

2012-02-13T20:23:38Z (12 years ago)

Author:

Frantisek Princ <frantisek.princ@…>

Branches:

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

Children:

856a36b

Parents:

03934c9e

Message:

error hangling in write operation, adjusted supported features for mounting

Location:

uspace

Files:

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

uspace/lib/ext4/libext4_superblock.h

@@ -182 +182 @@
 
 // TODO MODIFY features corresponding with implementation
-#define EXT4_FEATURE_COMPAT_SUPP EXT4_FEATURE_COMPAT_EXT_ATTR
+#define EXT4_FEATURE_COMPAT_SUPP                (EXT4_FEATURE_COMPAT_DIR_INDEX)
 
 #define EXT4_FEATURE_INCOMPAT_SUPP      (EXT4_FEATURE_INCOMPAT_FILETYPE| \
-                                         EXT4_FEATURE_INCOMPAT_RECOVER| \
-                                         EXT4_FEATURE_INCOMPAT_META_BG| \
                                          EXT4_FEATURE_INCOMPAT_EXTENTS| \
-                                         EXT4_FEATURE_INCOMPAT_64BIT| \
-                                         EXT4_FEATURE_INCOMPAT_FLEX_BG)
-
-#define EXT4_FEATURE_RO_COMPAT_SUPP     (EXT4_FEATURE_RO_COMPAT_SPARSE_SUPER| \
-                                         EXT4_FEATURE_RO_COMPAT_LARGE_FILE| \
-                                         EXT4_FEATURE_RO_COMPAT_GDT_CSUM| \
-                                         EXT4_FEATURE_RO_COMPAT_DIR_NLINK | \
-                                         EXT4_FEATURE_RO_COMPAT_EXTRA_ISIZE | \
-                                         EXT4_FEATURE_RO_COMPAT_BTREE_DIR |\
-                                         EXT4_FEATURE_RO_COMPAT_HUGE_FILE)
+                                         EXT4_FEATURE_INCOMPAT_64BIT)
+
+#define EXT4_FEATURE_RO_COMPAT_SUPP     ()
 
 

uspace/srv/fs/ext4fs/ext4fs_ops.c

@@ -210 +210 @@
         }
 
+
         ext4_directory_iterator_t it;
         rc = ext4_directory_iterator_init(&it, fs, eparent->inode_ref, 0);
@@ -1124 +1125 @@
         rc = block_get(&write_block, service_id, fblock, flags);
         if (rc != EOK) {
-                EXT4FS_DBG("error in loading block \%d", rc);
                 ext4fs_node_put(fn);
                 async_answer_0(callid, rc);
@@ -1136 +1136 @@
         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);
+                ext4fs_node_put(fn);
+                return rc;
         }
 
@@ -1144 +1144 @@
         rc = block_put(write_block);
         if (rc != EOK) {
-                EXT4FS_DBG("error in writing block \%d", rc);
                 ext4fs_node_put(fn);
                 return rc;