Changeset 2b3dd78 in mainline for contrib/arch/uspace/srv/vfs/vfs.bp

Timestamp:

2018-01-31T12:02:00Z (9 years ago)

Author:

Jenda <jenda.jzqk73@…>

Branches:

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

Children:

5595841

Parents:

a0a9cc2 (diff), 14d789c (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 remote-tracking branch 'upstream/master' into forwardport

change tmon includes because of new stdlib

File:

• contrib/arch/uspace/srv/vfs/vfs.bp (modified) (2 diffs)

contrib/arch/uspace/srv/vfs/vfs.bp

@@ -129 +129 @@
         ?fstat {
                 tentative {
-                        ?ipc_m_data_read /* struct stat */ {
+                        ?ipc_m_data_read /* vfs_stat_t */ {
                                 alternative (fs; tmpfs; fat; devfs) {
                                         [fnc.vfs_grab_phone] ;
                                         !fs.stat {
-                                                !fs.ipc_m_data_read /* forward struct stat */
+                                                !fs.ipc_m_data_read /* forward vfs_stat_t */
                                         } ;
                                         [fnc.vfs_release_phone]
@@ -144 +144 @@
                 ?ipc_m_data_write /* path */ ;
                 tentative {
-                        ?ipc_m_data_read /* struct stat */ {
+                        ?ipc_m_data_read /* vfs_stat_t */ {
                                 alternative (fs; tmpfs; fat; devfs) {
                                         [fnc.vfs_lookup_internal] ;
                                         tentative {
                                                 !fs.stat {
-                                                        !fs.ipc_m_data_read /* forward struct stat */
+                                                        !fs.ipc_m_data_read /* forward vfs_stat_t */
                                                 }
                                         }