Changeset 1affcdf3 in mainline for uspace/lib/fs/libfs.h

Timestamp:

2011-06-10T19:33:41Z (15 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

1878386

Parents:

13ecdac9 (diff), 79a141a (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/lib/fs/libfs.h (modified) (2 diffs)

uspace/lib/fs/libfs.h

@@ -44 +44 @@
 typedef struct {
         bool mp_active;
-        int phone;
+        async_sess_t *sess;
         fs_handle_t fs_handle;
         devmap_handle_t devmap_handle;
@@ -88 +88 @@
 } fs_reg_t;
 
-extern int fs_register(int, fs_reg_t *, vfs_info_t *, async_client_conn_t);
+extern int fs_register(async_sess_t *, fs_reg_t *, vfs_info_t *,
+    async_client_conn_t);
 
 extern void fs_node_initialize(fs_node_t *);