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

File:

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

uspace/srv/vfs/vfs_lookup.c

@@ -53 +53 @@
 uint8_t *plb = NULL;
 
-static int plb_insert_entry(plb_entry_t *entry, char *path, size_t *start,
+static errno_t plb_insert_entry(plb_entry_t *entry, char *path, size_t *start,
     size_t len)
 {
@@ -138 +138 @@
 }
 
-int vfs_link_internal(vfs_node_t *base, char *path, vfs_triplet_t *child)
+errno_t vfs_link_internal(vfs_node_t *base, char *path, vfs_triplet_t *child)
 {
         assert(base != NULL);
@@ -148 +148 @@
         vfs_lookup_res_t res;
         char component[NAME_MAX + 1];
-        int rc;
+        errno_t rc;
         
         size_t len;
@@ -197 +197 @@
         
         rc = async_data_write_start(exch, component, str_size(component) + 1);
-        sysarg_t orig_rc;
+        errno_t orig_rc;
         async_wait_for(req, &orig_rc);
         vfs_exchange_release(exch);
@@ -207 +207 @@
 }
 
-static int out_lookup(vfs_triplet_t *base, size_t *pfirst, size_t *plen,
+static errno_t out_lookup(vfs_triplet_t *base, size_t *pfirst, size_t *plen,
     int lflag, vfs_lookup_res_t *result)
 {
@@ -213 +213 @@
         assert(result);
         
-        sysarg_t rc;
+        errno_t 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));
@@ -238 +238 @@
 }
 
-static int _vfs_lookup_internal(vfs_node_t *base, char *path, int lflag,
+static errno_t _vfs_lookup_internal(vfs_node_t *base, char *path, int lflag,
     vfs_lookup_res_t *result, size_t len)
 {
         size_t first;
-        int rc;
+        errno_t rc;
 
         plb_entry_t entry;
@@ -334 +334 @@
  *
  */
-int vfs_lookup_internal(vfs_node_t *base, char *path, int lflag,
+errno_t vfs_lookup_internal(vfs_node_t *base, char *path, int lflag,
     vfs_lookup_res_t *result)
 {
@@ -341 +341 @@
         
         size_t len;
-        int rc;
+        errno_t rc;
         char *npath = canonify(path, &len);
         if (!npath) {