Changeset 1db44ea in mainline for uspace/srv/vfs/vfs_register.c

Timestamp:

2011-09-25T18:46:45Z (13 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

36cb22f

Parents:

dcc44ca1 (diff), f9d8c3a (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes

File:

• uspace/srv/vfs/vfs_register.c (modified) (3 diffs)

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;