Changeset ff381a7 in mainline for uspace/srv/vfs/vfs.c

Timestamp:

2015-11-02T20:54:19Z (10 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

d8513177

Parents:

3feeab2 (diff), 5265eea4 (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 mainline changes.

File:

• uspace/srv/vfs/vfs.c (modified) (2 diffs)

uspace/srv/vfs/vfs.c

@@ -74 +74 @@
                         break;
                 case VFS_IN_MOUNT:
-                        vfs_mount(callid, &call);
+                        vfs_mount_srv(callid, &call);
                         break;
                 case VFS_IN_UNMOUNT:
-                        vfs_unmount(callid, &call);
+                        vfs_unmount_srv(callid, &call);
                         break;
                 case VFS_IN_OPEN:
@@ -181 +181 @@
          * Set a connection handling function/fibril.
          */
-        async_set_client_connection(vfs_connection);
+        async_set_fallback_port_handler(vfs_connection, NULL);
 
         /*