Changes in uspace/srv/vfs/vfs_lookup.c [51774cd:25a179e] in mainline

File:

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

uspace/srv/vfs/vfs_lookup.c

@@ -197 +197 @@
         
         rc = async_data_write_start(exch, component, str_size(component) + 1);
-        sysarg_t orig_rc;
+        int orig_rc;
         async_wait_for(req, &orig_rc);
         vfs_exchange_release(exch);
@@ -213 +213 @@
         assert(result);
         
-        sysarg_t rc;
+        int rc;
         ipc_call_t answer;
         async_exch_t *exch = vfs_exchange_grab(base->fs_handle);
@@ -222 +222 @@
         vfs_exchange_release(exch);
         
-        if ((int) rc < 0)
-                return (int) rc;
+        if (rc != EOK)
+                return rc;
         
         unsigned last = *pfirst + *plen;
@@ -229 +229 @@
         *plen = last - *pfirst;
         
-        result->triplet.fs_handle = (fs_handle_t) rc;
-        result->triplet.service_id = (service_id_t) IPC_GET_ARG1(answer);
+        result->triplet.fs_handle = (fs_handle_t) IPC_GET_ARG1(answer);
+        result->triplet.service_id = base->service_id;
         result->triplet.index = (fs_index_t) IPC_GET_ARG2(answer);
         result->size = MERGE_LOUP32(IPC_GET_ARG4(answer), IPC_GET_ARG5(answer));