Changes in uspace/srv/fs/ext2fs/ext2fs_ops.c [4e36219:b72efe8] in mainline

File:

• uspace/srv/fs/ext2fs/ext2fs_ops.c (modified) (9 diffs)

uspace/srv/fs/ext2fs/ext2fs_ops.c

@@ -187 +187 @@
 {
         EXT2FS_DBG("(%" PRIun ", -)", devmap_handle);
-        link_t *link;
         ext2fs_instance_t *tmp;
         
@@ -198 +197 @@
         }
 
-        for (link = instance_list.next; link != &instance_list; link = link->next) {
+        list_foreach(instance_list, link) {
                 tmp = list_get_instance(link, ext2fs_instance_t, link);
                 
@@ -241 +240 @@
         }
         
-        rc = ext2_directory_iterator_init(&it, fs, eparent->inode_ref, 0);
+        rc = ext2_directory_iterator_init(&it, fs, eparent->inode_ref);
         if (rc != EOK) {
                 return rc;
@@ -479 +478 @@
         }
         
-        rc = ext2_directory_iterator_init(&it, fs, enode->inode_ref, 0);
+        rc = ext2_directory_iterator_init(&it, fs, enode->inode_ref);
         if (rc != EOK) {
                 EXT2FS_DBG("error %u", rc);
@@ -819 +818 @@
 {
         ext2_directory_iterator_t it;
-        aoff64_t next;
+        aoff64_t cur;
         uint8_t *buf;
         size_t name_size;
@@ -825 +824 @@
         bool found = false;
         
-        rc = ext2_directory_iterator_init(&it, inst->filesystem, inode_ref, pos);
+        rc = ext2_directory_iterator_init(&it, inst->filesystem, inode_ref);
         if (rc != EOK) {
                 async_answer_0(callid, rc);
@@ -832 +831 @@
         }
         
-        /* Find next interesting directory entry.
-         * We want to skip . and .. entries
+        /* Find the index we want to read
+         * Note that we need to iterate and count as
+         * the underlying structure is a linked list
+         * Moreover, we want to skip . and .. entries
          * as these are not used in HelenOS
          */
+        cur = 0;
         while (it.current != NULL) {
                 if (it.current->inode == 0) {
@@ -849 +851 @@
                 }
                 
-                /* The on-disk entry does not contain \0 at the end
-                        * end of entry name, so we copy it to new buffer
-                        * and add the \0 at the end
-                        */
-                buf = malloc(name_size+1);
-                if (buf == NULL) {
-                        ext2_directory_iterator_fini(&it);
-                        async_answer_0(callid, ENOMEM);
-                        async_answer_0(rid, ENOMEM);
-                        return;
+                /* Is this the dir entry we want to read? */
+                if (cur == pos) {
+                        /* The on-disk entry does not contain \0 at the end
+                         * end of entry name, so we copy it to new buffer
+                         * and add the \0 at the end
+                         */
+                        buf = malloc(name_size+1);
+                        if (buf == NULL) {
+                                ext2_directory_iterator_fini(&it);
+                                async_answer_0(callid, ENOMEM);
+                                async_answer_0(rid, ENOMEM);
+                                return;
+                        }
+                        memcpy(buf, &it.current->name, name_size);
+                        *(buf+name_size) = 0;
+                        found = true;
+                        (void) async_data_read_finalize(callid, buf, name_size+1);
+                        free(buf);
+                        break;
                 }
-                memcpy(buf, &it.current->name, name_size);
-                *(buf+name_size) = 0;
-                found = true;
-                (void) async_data_read_finalize(callid, buf, name_size+1);
-                free(buf);
-                break;
+                cur++;
                 
 skip:
@@ -877 +883 @@
         }
         
+        rc = ext2_directory_iterator_fini(&it);
+        if (rc != EOK) {
+                async_answer_0(rid, rc);
+                return;
+        }
+        
         if (found) {
-                rc = ext2_directory_iterator_next(&it);
-                if (rc != EOK) {
-                        async_answer_0(rid, rc);
-                        return;
-                }
-                next = it.current_offset;
-        }
-        
-        rc = ext2_directory_iterator_fini(&it);
-        if (rc != EOK) {
-                async_answer_0(rid, rc);
-                return;
-        }
-        
-        if (found) {
-                async_answer_1(rid, EOK, next-pos);
+                async_answer_1(rid, EOK, 1);
         }
         else {