Changeset 132ab5d1 in mainline for uspace/srv/vfs/vfs_lookup.c

Timestamp:

2018-01-30T03:20:45Z (8 years ago)

Author:

Jenda <jenda.jzqk73@…>

Branches:

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

Children:

5a6cc679

Parents:

8bfb163 (diff), 6a5d05b (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 commit '6a5d05bd2551e64111bea4f9332dd7448c26ce84' into forwardport

Separate return value from error code in gen_irq_code*().

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));