Changes in uspace/srv/vfs/vfs_lookup.c [ffa2c8ef:df908b3] in mainline

File:

• uspace/srv/vfs/vfs_lookup.c (modified) (4 diffs)

uspace/srv/vfs/vfs_lookup.c

@@ -37 +37 @@
 
 #include "vfs.h"
+#include <ipc/ipc.h>
 #include <macros.h>
 #include <async.h>
@@ -160 +161 @@
         ipc_call_t answer;
         int phone = vfs_grab_phone(root->fs_handle);
-        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,
+        aid_t req = async_send_5(phone, VFS_OUT_LOOKUP, (ipcarg_t) first,
+            (ipcarg_t) (first + len - 1) % PLB_SIZE,
+            (ipcarg_t) root->dev_handle, (ipcarg_t) lflag, (ipcarg_t) index,
             &answer);
         
-        sysarg_t rc;
+        ipcarg_t rc;
         async_wait_for(req, &rc);
         vfs_release_phone(root->fs_handle, phone);
@@ -178 +179 @@
         fibril_mutex_unlock(&plb_mutex);
         
-        if ((int) rc < EOK)
+        if (((int) rc < EOK) || (!result))
                 return (int) rc;
-
-        if (!result)
-                return EOK;
         
         result->triplet.fs_handle = (fs_handle_t) rc;
-        result->triplet.devmap_handle = (devmap_handle_t) IPC_GET_ARG1(answer);
+        result->triplet.dev_handle = (dev_handle_t) IPC_GET_ARG1(answer);
         result->triplet.index = (fs_index_t) IPC_GET_ARG2(answer);
         result->size =
@@ -212 +210 @@
         ipc_call_t answer;
         aid_t req = async_send_2(phone, VFS_OUT_OPEN_NODE,
-            (sysarg_t) result->triplet.devmap_handle,
-            (sysarg_t) result->triplet.index, &answer);
-        
-        sysarg_t rc;
+            (ipcarg_t) result->triplet.dev_handle,
+            (ipcarg_t) result->triplet.index, &answer);
+        
+        ipcarg_t rc;
         async_wait_for(req, &rc);
         vfs_release_phone(result->triplet.fs_handle, phone);