Changeset 4f5dc18 in mainline for contrib/arch/uspace/lib/libfs/fnc.libfs_mount

Timestamp:

2009-11-03T21:36:54Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

1647323

Parents:

bbddafb (diff), b1c21c2 (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 with mainline.

File:

• contrib/arch/uspace/lib/libfs/fnc.libfs_mount (modified) (1 diff)

contrib/arch/uspace/lib/libfs/fnc.libfs_mount

@@ -2 +2 @@
         ?ipc_m_connection_clone ;
         ?ipc_m_data_write /* mount options */ {
-                alternative (fs; tmpfs; fat; devfs) {
+                alternative (fs; tmpfs_nested; fat_nested; devfs_nested) {
                         !fs.ipc_m_connect_to_me ;
-                        !fs.mounted ;
-                        !fs.ipc_m_data_write /* forward */
+                        !fs.mounted {
+                                !fs.ipc_m_data_write /* forward */
+                        }
                 }
         }