Changeset 6fb8b2c in mainline

Timestamp:

2017-12-06T21:54:37Z (6 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

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

Children:

9eb1ff5

Parents:

bd1b755

Message:

Use first return value from VFS_OUT_LOOKUP for file descriptor,
instead of service id which is never changed.

Location:

uspace

Files:

• lib/fs/libfs.c (modified) (3 diffs)
• srv/vfs/vfs_lookup.c (modified) (2 diffs)

uspace/lib/fs/libfs.c

@@ -656 +656 @@
                 if (rc == EOK) {
                         aoff64_t size = ops->size_get(cur);
-                        async_answer_5(rid, fs_handle, service_id,
+                        async_answer_5(rid, EOK, fs_handle,
                             ops->index_get(cur),
                             (ops->is_directory(cur) << 16) | last,
@@ -699 +699 @@
 out1:
         if (!cur) {
-                async_answer_5(rid, fs_handle, service_id, ops->index_get(par),
+                async_answer_5(rid, EOK, fs_handle, ops->index_get(par),
                     (ops->is_directory(par) << 16) | last_next,
                     LOWER32(ops->size_get(par)), UPPER32(ops->size_get(par)));
@@ -705 +705 @@
         }
         
-        async_answer_5(rid, fs_handle, service_id, ops->index_get(cur),
+        async_answer_5(rid, EOK, fs_handle, ops->index_get(cur),
             (ops->is_directory(cur) << 16) | last, LOWER32(ops->size_get(cur)),
             UPPER32(ops->size_get(cur)));

uspace/srv/vfs/vfs_lookup.c

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