Changeset 5126f80 in mainline for uspace/srv/vfs/vfs_lookup.c

Timestamp:

2017-03-08T11:42:17Z (8 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

0d35511

Parents:

a737667e

git-author:

Jiri Zarevucky <zarevucky.jiri@…> (2017-03-08 11:42:17)

git-committer:

Jakub Jermar <jakub@…> (2017-03-08 11:42:17)

Message:

Merge from lp:~zarevucky-jiri/helenos/vfs-2.5/ revision 1946

Original commit messages:

1946: Jiri Zarevucky 2013-08-06 Relativize mount, add root handle to libc and remove root from VFS server. This wraps up the "relativization" phase.

Breakage:

• Dynamic builds broken
• Mount table lookups by name

File:

• uspace/srv/vfs/vfs_lookup.c (modified) (1 diff)

uspace/srv/vfs/vfs_lookup.c

@@ -330 +330 @@
         if (result != NULL) {
                 /* The found file may be a mount point. Try to cross it. */
-                if (!(lflag & L_MP)) {
+                if (!(lflag & (L_MP|L_DISABLE_MOUNTS))) {
                         base = vfs_node_peek(&res);
                         if (base != NULL && base->mount != NULL) {