Changeset f49638e in mainline

Timestamp:

2011-11-22T10:01:42Z (13 years ago)

Author:

Frantisek Princ <frantisek.princ@…>

Branches:

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

Children:

8be96a0

Parents:

ebeaaa06

Message:

directory entry delete operation (without HTree index modification)

Location:

uspace

Files:

• lib/ext4/Makefile (modified) (1 diff)
• lib/ext4/libext4_directory.c (modified) (2 diffs)
• lib/ext4/libext4_directory.h (modified) (1 diff)
• srv/fs/ext4fs/ext4fs_ops.c (modified) (3 diffs)

uspace/lib/ext4/Makefile

@@ -29 +29 @@
 USPACE_PREFIX = ../..
 LIBRARY = libext4
-EXTRA_CFLAGS = -I$(LIBBLOCK_PREFIX)
-LIBS = $(LIBBLOCK_PREFIX)/libblock.a
+EXTRA_CFLAGS = -I$(LIBBLOCK_PREFIX) -I$(LIBPOSIX_PREFIX)
+LIBS = $(LIBBLOCK_PREFIX)/libblock.a $(LIBPOSIX_PREFIX)/libposix.a 
 
 SOURCES = \

uspace/lib/ext4/libext4_directory.c

@@ -38 +38 @@
 #include <byteorder.h>
 #include <errno.h>
+#include <malloc.h>
+#include <string.h>
 #include "libext4.h"
 
@@ -241 +243 @@
 
 
+int ext4_directory_remove_entry(ext4_filesystem_t* fs,
+                ext4_inode_ref_t *inode_ref, const char *name)
+{
+
+        // TODO modify HTREE index if exists
+
+        int rc;
+        ext4_directory_iterator_t it;
+
+        rc = ext4_directory_iterator_init(&it, fs, inode_ref, 0);
+        if (rc != EOK) {
+                return rc;
+        }
+
+        uint16_t name_size = strlen(name);
+        bool found = false;
+
+        while (it.current != NULL) {
+
+                if (it.current->inode == 0) {
+                        goto skip;
+                }
+
+                uint16_t entry_name_size = ext4_directory_entry_ll_get_name_length(
+                    fs->superblock, it.current);
+
+                /* skip . and .. */
+                if (entry_name_size == 1 && name[0] == '.') {
+                        goto skip;
+                }
+
+                if (entry_name_size == 2 && name[0] == '.' && name[1] == '.') {
+                        goto skip;
+                }
+
+                if (name_size == entry_name_size &&
+                                bcmp(name, &it.current->name, name_size) == 0) {
+
+                        found = true;
+                        break;
+                }
+
+skip:
+                rc = ext4_directory_iterator_next(&it);
+                if (rc != EOK) {
+                        ext4_directory_iterator_fini(&it);
+                        return rc;
+                }
+        }
+
+        if (! found) {
+                rc = ext4_directory_iterator_fini(&it);
+                if (rc != EOK) {
+                        return rc;
+                }
+                return ENOENT;
+        }
+
+
+        uint32_t block_size = ext4_superblock_get_block_size(fs->superblock);
+        uint32_t pos = it.current_offset % block_size;
+
+        ext4_directory_entry_ll_set_inode(it.current, 0);
+
+        if (pos != 0) {
+                uint32_t offset = 0;
+
+                ext4_directory_entry_ll_t *tmp_dentry = it.current_block->data;
+                uint16_t tmp_dentry_length =
+                                ext4_directory_entry_ll_get_entry_length(tmp_dentry);
+
+                while ((offset + tmp_dentry_length) < pos) {
+                        offset += ext4_directory_entry_ll_get_entry_length(tmp_dentry);
+                        tmp_dentry = it.current_block->data + offset;
+                        tmp_dentry_length =
+                                        ext4_directory_entry_ll_get_entry_length(tmp_dentry);
+                }
+
+                assert(tmp_dentry_length + offset == pos);
+
+                uint16_t del_entry_length =
+                                ext4_directory_entry_ll_get_entry_length(it.current);
+                ext4_directory_entry_ll_set_entry_length(tmp_dentry,
+                                tmp_dentry_length + del_entry_length);
+
+        }
+
+
+        it.current_block->dirty = true;
+
+        ext4_directory_iterator_fini(&it);
+        return EOK;
+}
 
 

uspace/lib/ext4/libext4_directory.h

@@ -80 +80 @@
 extern int ext4_directory_iterator_fini(ext4_directory_iterator_t *);
 
+extern int ext4_directory_remove_entry(ext4_filesystem_t* ,
+                ext4_inode_ref_t *, const char *name);
+
 #endif
 

uspace/srv/fs/ext4fs/ext4fs_ops.c

@@ -446 +446 @@
 int ext4fs_unlink(fs_node_t *pfn, fs_node_t *cfn, const char *name)
 {
-
-        return ENOTSUP;
-
         int rc;
 
@@ -463 +460 @@
 
         // Remove entry from parent directory
-        // TODO
-//      rc = ext4_directory_remove_entry(EXT4FS_NODE(pfn), name);
-//      if (rc != EOK) {
-//              return rc;
-//      }
+        ext4_inode_ref_t *parent = EXT4FS_NODE(pfn)->inode_ref;
+        ext4_filesystem_t *fs = EXT4FS_NODE(pfn)->instance->filesystem;
+        rc = ext4_directory_remove_entry(fs, parent, name);
+        if (rc != EOK) {
+                return rc;
+        }
 
         // Decrement links count
@@ -489 +487 @@
                 parent_inode_ref->dirty = true;
         }
-
 
         return EOK;