Changeset 8d6a41c in mainline

Timestamp:

2011-11-05T13:00:34Z (12 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

45ffe9f

Parents:

72fda53

Message:

Remove the mtab_list_ent structure.

Location:

uspace

Files:

• app/bdsh/cmds/modules/mount/mount.c (modified) (1 diff)
• lib/c/generic/vfs/vfs.c (modified) (3 diffs)
• lib/c/include/vfs/vfs_mtab.h (modified) (2 diffs)
• srv/vfs/vfs_ops.c (modified) (5 diffs)

uspace/app/bdsh/cmds/modules/mount/mount.c

@@ -68 +68 @@
         get_mtab_list(&mtab_list);
 
-        mtab_list_ent_t *old_ent = NULL;
+        mtab_ent_t *old_ent = NULL;
 
         list_foreach(mtab_list, cur) {
-                mtab_list_ent_t *ent = list_get_instance(cur, mtab_list_ent_t,
+                mtab_ent_t *mtab_ent = list_get_instance(cur, mtab_ent_t,
                     link);
-
-                mtab_ent_t *mtab_ent = &ent->mtab_ent;
 
                 if (old_ent)
                         free(old_ent);
 
-                old_ent = ent;
+                old_ent = mtab_ent;
 
                 printf("%s on %s ", mtab_ent->fs_name, mtab_ent->mp);

uspace/lib/c/generic/vfs/vfs.c

@@ -35 +35 @@
 #include <vfs/canonify.h>
 #include <vfs/vfs.h>
-#include <vfs/vfs_mtab.h>
 #include <vfs/vfs_sess.h>
 #include <macros.h>
@@ -849 +848 @@
 
         for (i = 0; i < num_mounted_fs; ++i) {
-                mtab_list_ent_t *mtab_list_ent;
                 mtab_ent_t *mtab_ent;
 
-                mtab_list_ent = malloc(sizeof(mtab_list_ent_t));
-                if (!mtab_list_ent) {
+                mtab_ent = malloc(sizeof(mtab_ent_t));
+                if (!mtab_ent) {
                         rc = ENOMEM;
                         goto exit;
                 }
 
-                memset(mtab_list_ent, 0, sizeof(mtab_list_ent_t));
-
-                mtab_ent = &mtab_list_ent->mtab_ent;
+                memset(mtab_ent, 0, sizeof(mtab_ent_t));
 
                 rc = async_data_read_start(exch, (void *) mtab_ent->mp,
@@ -890 +886 @@
                 mtab_ent->fs_handle = p[2];
 
-                link_initialize(&mtab_list_ent->link);
-                list_append(&mtab_list_ent->link, mtab_list);
+                link_initialize(&mtab_ent->link);
+                list_append(&mtab_ent->link, mtab_list);
         }
 

uspace/lib/c/include/vfs/vfs_mtab.h

@@ -40 +40 @@
 
 typedef struct mtab_ent {
+        link_t link;
         char mp[MAX_PATH_LEN];
         char opts[MAX_MNTOPTS_LEN];
@@ -48 +49 @@
 } mtab_ent_t;
 
-typedef struct mtab_list_ent {
-        link_t link;
-        mtab_ent_t mtab_ent;
-} mtab_list_ent_t;
-
 #endif
 

uspace/srv/vfs/vfs_ops.c

@@ -362 +362 @@
 
         /* Add the filesystem info to the list of mounted filesystems */
-        mtab_list_ent_t *mtab_list_ent = malloc(sizeof(mtab_list_ent_t));
-        if (!mtab_list_ent) {
+        mtab_ent_t *mtab_ent = malloc(sizeof(mtab_ent_t));
+        if (!mtab_ent) {
                 async_answer_0(callid, ENOMEM);
                 async_answer_0(rid, ENOMEM);
@@ -371 +371 @@
                 return;
         }
-
-        mtab_ent_t *mtab_ent = &mtab_list_ent->mtab_ent;
 
         mtab_ent->fs_handle = fs_handle;
@@ -381 +379 @@
         mtab_ent->instance = instance;
 
-        link_initialize(&mtab_list_ent->link);
+        link_initialize(&mtab_ent->link);
 
         fibril_mutex_lock(&mtab_list_lock);
-        list_append(&mtab_list_ent->link, &mtab_list);
+        list_append(&mtab_ent->link, &mtab_list);
         mtab_size++;
         fibril_mutex_unlock(&mtab_list_lock);
@@ -538 +536 @@
 
         list_foreach(mtab_list, cur) {
-                mtab_list_ent_t *ent = list_get_instance(cur, mtab_list_ent_t,
+                mtab_ent_t *mtab_ent = list_get_instance(cur, mtab_ent_t,
                     link);
 
-                mtab_ent_t *mtab_ent = &ent->mtab_ent;
-
                 if (str_cmp(mtab_ent->mp, mp) == 0) {
-                        list_remove(&ent->link);
+                        list_remove(&mtab_ent->link);
                         mtab_size--;
-                        free(ent);
+                        free(mtab_ent);
                         found = 1;
                         break;
@@ -1363 +1359 @@
 
         list_foreach(mtab_list, cur) {
-                mtab_list_ent_t *ent = list_get_instance(cur, mtab_list_ent_t,
+                mtab_ent_t *mtab_ent = list_get_instance(cur, mtab_ent_t,
                     link);
-
-                mtab_ent_t *mtab_ent = &ent->mtab_ent;
 
                 rc = ENOTSUP;