Changeset ab936440 in mainline for uspace/srv/vfs/vfs_ops.c

Timestamp:

2019-02-12T20:42:42Z (6 years ago)

Author:

Matthieu Riolo <matthieu.riolo@…>

Branches:

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

Children:

f31ca47

Parents:

7f7817a9 (diff), 4805495 (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.

git-author:

Matthieu Riolo <matthieu.riolo@…> (2019-02-12 20:26:18)

git-committer:

Matthieu Riolo <matthieu.riolo@…> (2019-02-12 20:42:42)

Message:

Merge branch 'master' into bdsh_alias

Conflicts:

uspace/app/bdsh/Makefile
uspace/app/bdsh/cmds/modules/modules.h

Ccheck correction and removing header which includes itself

File:

• uspace/srv/vfs/vfs_ops.c (modified) (3 diffs)

uspace/srv/vfs/vfs_ops.c

@@ -637 +637 @@
 
         async_exch_t *exch = vfs_exchange_grab(node->fs_handle);
-        errno_t rc = async_data_read_forward_fast(exch, VFS_OUT_STAT,
-            node->service_id, node->index, true, 0, NULL);
+        errno_t rc = async_data_read_forward_3_0(exch, VFS_OUT_STAT,
+            node->service_id, node->index, true);
         vfs_exchange_release(exch);
 
@@ -654 +654 @@
 
         async_exch_t *exch = vfs_exchange_grab(node->fs_handle);
-        errno_t rc = async_data_read_forward_fast(exch, VFS_OUT_STATFS,
-            node->service_id, node->index, false, 0, NULL);
+        errno_t rc = async_data_read_forward_3_0(exch, VFS_OUT_STATFS,
+            node->service_id, node->index, false);
         vfs_exchange_release(exch);
 
@@ -892 +892 @@
         rc = vfs_fd_alloc(&file, false, out_fd);
         if (rc != EOK) {
+                fibril_rwlock_read_unlock(&namespace_rwlock);
                 vfs_node_put(node);
                 vfs_file_put(parent);