Changeset 132ab5d1 in mainline for uspace/lib/fs/libfs.c

Timestamp:

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

Author:

Jenda <jenda.jzqk73@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/fix-logger-deadlock, 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/lib/fs/libfs.c (modified) (3 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)));