Changeset 973ef9fc in mainline for uspace/srv/vfs/vfs_lookup.c

Timestamp:

2010-12-25T21:20:28Z (13 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

631ee0c

Parents:

1bfd3d3 (diff), 09178b7f (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_lookup.c (modified) (3 diffs)

uspace/srv/vfs/vfs_lookup.c

@@ -161 +161 @@
         ipc_call_t answer;
         int phone = vfs_grab_phone(root->fs_handle);
-        aid_t req = async_send_5(phone, VFS_OUT_LOOKUP, (ipcarg_t) first,
-            (ipcarg_t) (first + len - 1) % PLB_SIZE,
-            (ipcarg_t) root->devmap_handle, (ipcarg_t) lflag, (ipcarg_t) index,
+        aid_t req = async_send_5(phone, VFS_OUT_LOOKUP, (sysarg_t) first,
+            (sysarg_t) (first + len - 1) % PLB_SIZE,
+            (sysarg_t) root->devmap_handle, (sysarg_t) lflag, (sysarg_t) index,
             &answer);
         
-        ipcarg_t rc;
+        sysarg_t rc;
         async_wait_for(req, &rc);
         vfs_release_phone(root->fs_handle, phone);
@@ -179 +179 @@
         fibril_mutex_unlock(&plb_mutex);
         
-        if (((int) rc < EOK) || (!result))
+        if ((int) rc < EOK)
                 return (int) rc;
+
+        if (!result)
+                return EOK;
         
         result->triplet.fs_handle = (fs_handle_t) rc;
@@ -210 +213 @@
         ipc_call_t answer;
         aid_t req = async_send_2(phone, VFS_OUT_OPEN_NODE,
-            (ipcarg_t) result->triplet.devmap_handle,
-            (ipcarg_t) result->triplet.index, &answer);
-        
-        ipcarg_t rc;
+            (sysarg_t) result->triplet.devmap_handle,
+            (sysarg_t) result->triplet.index, &answer);
+        
+        sysarg_t rc;
         async_wait_for(req, &rc);
         vfs_release_phone(result->triplet.fs_handle, phone);