Changeset e80c2ff in mainline for uspace/srv/fs/minixfs/mfs_ops.c

Timestamp:

2011-07-06T19:56:57Z (14 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

b89281b

Parents:

70ac0af

Message:

The read_directory_entry() function has been rewritten to avoid dynamic memory allocation
of the d_info structure.

File:

• uspace/srv/fs/minixfs/mfs_ops.c (modified) (6 diffs)

uspace/srv/fs/minixfs/mfs_ops.c

@@ -335 +335 @@
         struct mfs_node *mnode = pfn->data;
         struct mfs_ino_info *ino_i = mnode->ino_i;
-        struct mfs_dentry_info *d_info;
+        struct mfs_dentry_info d_info;
         int r;
 
@@ -344 +344 @@
         const size_t comp_size = str_size(component);
 
-        int i = 2;
-        while (1) {
-                r = read_directory_entry(mnode, &d_info, i++);
+        unsigned i;
+        for (i = 0; i < mnode->ino_i->i_size / sbi->dirsize; ++i) {
+                r = read_directory_entry(mnode, &d_info, i);
                 on_error(r, return r);
 
-                if (!d_info) {
-                        /*Reached the end of the directory entry list*/
-                        break;
-                }
-
-                if (!d_info->d_inum) {
+                if (!d_info.d_inum) {
                         /*This entry is not used*/
-                        free(d_info);
                         continue;
                 }
 
-                if (!bcmp(component, d_info->d_name, min(sbi->max_name_len,
+                if (!bcmp(component, d_info.d_name, min(sbi->max_name_len,
                                 comp_size))) {
                         /*Hit!*/
                         mfs_node_core_get(rfn, mnode->instance,
-                                          d_info->d_inum);
-                        free(d_info);
+                                          d_info.d_inum);
                         goto found;
                 }
-                free(d_info);
         }
         *rfn = NULL;
@@ -566 +558 @@
 {
         struct mfs_node *mnode = fsnode->data;
+        struct mfs_sb_info *sbi = mnode->instance->sbi;
         int r;
 
@@ -573 +566 @@
                 goto out;
 
-        struct mfs_dentry_info *d_info;
+        struct mfs_dentry_info d_info;
 
         /* The first two dentries are always . and .. */
-        int i = 2;
-        while (1) {
-                r = read_directory_entry(mnode, &d_info, i++);
+        unsigned i;
+        for (i = 0; i < mnode->ino_i->i_size / sbi->dirsize; ++i) {
+                r = read_directory_entry(mnode, &d_info, i);
                 on_error(r, return r);
 
-                if (!d_info) {
-                        /*Reached the end of the dentries list*/
+                if (d_info.d_inum) {
+                        /*A valid entry has been found*/
+                        *has_children = true;
                         break;
                 }
-
-                if (d_info->d_inum) {
-                        /*A valid entry has been found*/
-                        *has_children = true;
-                        free(d_info);
-                        break;
-                }
-
-                free(d_info);
-        }
-
+        }
 out:
 
@@ -636 +620 @@
         if (S_ISDIR(ino_i->i_mode)) {
                 aoff64_t spos = pos;
-                struct mfs_dentry_info *d_info;
-
-                while (1) {
+                struct mfs_dentry_info d_info;
+                struct mfs_sb_info *sbi = mnode->instance->sbi;
+
+                unsigned i;
+                for (i = pos; i < mnode->ino_i->i_size / sbi->dirsize; ++i) {
                         rc = read_directory_entry(mnode, &d_info, pos);
                         on_error(rc, goto out_error);
 
-                        if (!d_info) {
-                                /*Reached the end of the dentries list*/
-                                break;
-                        }
-
-                        if (d_info->d_inum) {
+                        if (d_info.d_inum) {
                                 /*Dentry found!*/
                                 goto found;
                         }
-
-                        free(d_info);
                         pos++;
                 }
@@ -661 +640 @@
                 return;
 found:
-                async_data_read_finalize(callid, d_info->d_name,
-                                         str_size(d_info->d_name) + 1);
+                async_data_read_finalize(callid, d_info.d_name,
+                                         str_size(d_info.d_name) + 1);
                 bytes = ((pos - spos) + 1);
         } else {