Changeset 18525c5 in mainline

Timestamp:

2007-10-04T13:00:10Z (17 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

1c38445

Parents:

116d3f6f

Message:

Tiny refinement of if-else_if-else statement in vfs_register.c.

Location:

uspace

Files:

• lib/libc/generic/async.c (modified) (1 diff)
• srv/vfs/vfs.c (modified) (1 diff)
• srv/vfs/vfs_mount.c (modified) (1 diff)

uspace/lib/libc/generic/async.c

@@ -519 +519 @@
         if ((callid & IPC_CALLID_NOTIFICATION)) {
                 in_interrupt_handler = 1;
-                (*interrupt_received)(callid,call);
+                (*interrupt_received)(callid, call);
                 in_interrupt_handler = 0;
                 return;

uspace/srv/vfs/vfs.c

@@ -94 +94 @@
                 case VFS_REGISTER:
                         vfs_register(callid, &call);
+                        keep_on_going = false;
                         break;
                 case VFS_MOUNT:

uspace/srv/vfs/vfs_mount.c

@@ -218 +218 @@
         vfs_release_phone(phone);
 
-        if ((rc1 == EOK) && (rc2 == EOK))
-                ipc_answer_fast(rid, EOK, 0, 0);
-        else if (rc1 != EOK)
+        if (rc2 == EOK)
                 ipc_answer_fast(rid, rc1, 0, 0);
+        else if (rc1 == EOK)
+                ipc_answer_fast(rid, rc2, 0, 0);
         else
-                ipc_answer_fast(rid, rc2, 0, 0);
+                ipc_answer_fast(rid, rc1, 0, 0);
 }