Changeset 6b8e5b7 in mainline

Timestamp:

2011-11-05T23:08:52Z (13 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

6f9ef87a

Parents:

7e8403b

Message:

vfs_get_mtab(): service_id is more useful than flags and fs_handle

Location:

uspace

Files:

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

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

@@ -84 +84 @@
                         printf("opts=%s ", mtab_ent->opts);
 
-                printf("(instance=%d, flags=%d, fs_handle=%d)\n",
-                    mtab_ent->instance, mtab_ent->flags, mtab_ent->fs_handle);
+                printf("(instance=%d, service_id=%" PRIu64 ")\n",
+                    mtab_ent->instance, mtab_ent->service_id);
         }
 

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

@@ -873 +873 @@
                         goto exit;
 
-                sysarg_t p[3];
-
-                rc = async_req_0_3(exch, VFS_IN_PING, &p[0], &p[1], &p[2]);
+                sysarg_t p[2];
+
+                rc = async_req_0_2(exch, VFS_IN_PING, &p[0], &p[1]);
                 if (rc != EOK)
                         goto exit;
 
-                mtab_ent->flags = p[0];
-                mtab_ent->instance = p[1];
-                mtab_ent->fs_handle = p[2];
+                mtab_ent->instance = p[0];
+                mtab_ent->service_id = p[1];
 
                 link_initialize(&mtab_ent->link);

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

@@ -45 +45 @@
         char opts[MAX_MNTOPTS_LEN];
         char fs_name[FS_NAME_MAXLEN];
-        unsigned int flags;
         unsigned int instance;
-        fs_handle_t  fs_handle;
+        service_id_t service_id;
 } mtab_ent_t;
 

uspace/srv/vfs/vfs_ops.c

@@ -369 +369 @@
         }
 
-        mtab_ent->fs_handle = fs_handle;
         str_cpy(mtab_ent->mp, MAX_PATH_LEN, mp);
         str_cpy(mtab_ent->fs_name, FS_NAME_MAXLEN, fs_name);
         str_cpy(mtab_ent->opts, MAX_MNTOPTS_LEN, opts);
-        mtab_ent->flags = flags;
         mtab_ent->instance = instance;
+        mtab_ent->service_id = service_id;
 
         link_initialize(&mtab_ent->link);
@@ -1393 +1392 @@
 
                 rc = EOK;
-                async_answer_3(callid, rc, mtab_ent->flags, mtab_ent->instance,
-                    mtab_ent->fs_handle);
+                async_answer_2(callid, rc, mtab_ent->instance,
+                    mtab_ent->service_id);
         }