Changeset 1dff985 in mainline for uspace/srv/vfs/vfs.c

Timestamp:

2017-03-03T21:32:38Z (7 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

c577a9a

Parents:

5b46ec8 (diff), b8dbe2f (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 from lp:~zarevucky-jiri/helenos/vfs-2.5 up to revision 1926

File:

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

uspace/srv/vfs/vfs.c

@@ -104 +104 @@
                         vfs_unmount_srv(callid, &call);
                         break;
-                case VFS_IN_OPEN:
-                        vfs_open(callid, &call);
+                case VFS_IN_WALK:
+                        vfs_walk(callid, &call);
+                        break;
+                case VFS_IN_OPEN2:
+                        vfs_open2(callid, &call);
                         break;
                 case VFS_IN_CLOSE:
@@ -125 +128 @@
                         vfs_fstat(callid, &call);
                         break;
-                case VFS_IN_STAT:
-                        vfs_stat(callid, &call);
-                        break;
-                case VFS_IN_MKDIR:
-                        vfs_mkdir(callid, &call);
-                        break;
-                case VFS_IN_UNLINK:
-                        vfs_unlink(callid, &call);
+                case VFS_IN_UNLINK2:
+                        vfs_unlink2(callid, &call);
                         break;
                 case VFS_IN_RENAME: