Changeset 8d6a41c in mainline for uspace/srv/vfs/vfs_ops.c

Timestamp:

2011-11-05T13:00:34Z (14 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.

File:

• uspace/srv/vfs/vfs_ops.c (modified) (5 diffs)

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;