Changeset 4979403 in mainline for uspace/srv/vfs

Timestamp:

2011-09-23T15:39:07Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

286286c

Parents:

8895d05

git-author:

Maurizio Lombardi <m.lombardi85@…> (2011-09-23 15:39:07)

git-committer:

Jakub Jermar <jakub@…> (2011-09-23 15:39:07)

Message:

Allow more instances of the same FS to be used.
(Thanks to Maurizio Lombardi.)

Location:

uspace/srv/vfs

Files:

• vfs.h (modified) (1 diff)
• vfs_ops.c (modified) (2 diffs)
• vfs_register.c (modified) (3 diffs)

uspace/srv/vfs/vfs.h

@@ -171 +171 @@
 extern void vfs_exchange_release(async_exch_t *);
 
-extern fs_handle_t fs_name_to_handle(char *, bool);
+extern fs_handle_t fs_name_to_handle(unsigned int instance, char *, bool);
 extern vfs_info_t *fs_handle_to_info(fs_handle_t);
 

uspace/srv/vfs/vfs_ops.c

@@ -276 +276 @@
         
         /*
+         * Instance number is passed as ARG3.
+         */
+        unsigned int instance = IPC_GET_ARG3(*request);
+
+        /*
          * For now, don't make use of ARG3, but it can be used to
          * carry mount options in the future.
@@ -335 +340 @@
         fs_handle_t fs_handle;
 recheck:
-        fs_handle = fs_name_to_handle(fs_name, false);
+        fs_handle = fs_name_to_handle(instance, fs_name, false);
         if (!fs_handle) {
                 if (flags & IPC_FLAG_BLOCKING) {

uspace/srv/vfs/vfs_register.c

@@ -154 +154 @@
          * Check for duplicit registrations.
          */
-        if (fs_name_to_handle(fs_info->vfs_info.name, false)) {
+        if (fs_name_to_handle(fs_info->vfs_info.instance,
+                        fs_info->vfs_info.name, false)) {
                 /*
                  * We already register a fs like this.
@@ -297 +298 @@
  *
  */
-fs_handle_t fs_name_to_handle(char *name, bool lock)
+fs_handle_t fs_name_to_handle(unsigned int instance, char *name, bool lock)
 {
         int handle = 0;
@@ -306 +307 @@
         list_foreach(fs_list, cur) {
                 fs_info_t *fs = list_get_instance(cur, fs_info_t, fs_link);
-                if (str_cmp(fs->vfs_info.name, name) == 0) {
+                if (str_cmp(fs->vfs_info.name, name) == 0 &&
+                                instance == fs->vfs_info.instance) {
                         handle = fs->fs_handle;
                         break;