Changeset 4ef6645 in mainline

Timestamp:

2009-05-23T09:51:37Z (16 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

493853ec

Parents:

16d17ca

Message:

Surprisingly easy support for homogenous mounts.
It works by simply allowing autoconnections.

File:

• kernel/generic/src/ipc/sysipc.c (modified) (3 diffs)

kernel/generic/src/ipc/sysipc.c

@@ -356 +356 @@
                 GET_CHECK_PHONE(cloned_phone, IPC_GET_ARG1(call->data),
                     return ENOENT);
-                if (phone  == cloned_phone)
-                        return EEXISTS;
                 if (cloned_phone < phone) {
                         mutex_lock(&cloned_phone->lock);
                         mutex_lock(&phone->lock);
+                } else if (cloned_phone > phone) {
+                        mutex_lock(&phone->lock);
+                        mutex_lock(&cloned_phone->lock);
                 } else {
                         mutex_lock(&phone->lock);
-                        mutex_lock(&cloned_phone->lock);
                 }
                 if ((cloned_phone->state != IPC_PHONE_CONNECTED) ||
                     phone->state != IPC_PHONE_CONNECTED) {
-                        mutex_unlock(&cloned_phone->lock);
+                        if (cloned_phone != phone)
+                                mutex_unlock(&cloned_phone->lock);
                         mutex_unlock(&phone->lock);
                         return EINVAL;
@@ -379 +380 @@
                 newphid = phone_alloc(phone->callee->task);
                 if (newphid < 0) {
-                        mutex_unlock(&cloned_phone->lock);
+                        if (cloned_phone != phone)
+                                mutex_unlock(&cloned_phone->lock);
                         mutex_unlock(&phone->lock);
                         return ELIMIT;
@@ -385 +387 @@
                 ipc_phone_connect(&phone->callee->task->phones[newphid],
                     cloned_phone->callee);
-                mutex_unlock(&cloned_phone->lock);
+                if (cloned_phone != phone)
+                        mutex_unlock(&cloned_phone->lock);
                 mutex_unlock(&phone->lock);
                 /* Set the new phone for the callee. */