Changeset 00aece0 in mainline for uspace/srv/vfs/vfs.h

Timestamp:

2012-02-18T16:47:38Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

4449c6c

Parents:

bd5f3b7 (diff), f943dd3 (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/srv/vfs/vfs.h (modified) (4 diffs)

uspace/srv/vfs/vfs.h

@@ -150 +150 @@
 extern list_t fs_list;          /**< List of registered file systems. */
 
+extern fibril_mutex_t fs_mntlist_lock;
+extern list_t fs_mntlist;       /**< List of mounted file systems. */
+
 extern vfs_pair_t rootfs;       /**< Root file system. */
 
@@ -163 +166 @@
 extern list_t plb_entries;      /**< List of active PLB entries. */
 
-#define MAX_MNTOPTS_LEN         256
-
 /** Holding this rwlock prevents changes in file system namespace. */ 
 extern fibril_rwlock_t namespace_rwlock;
@@ -171 +172 @@
 extern void vfs_exchange_release(async_exch_t *);
 
-extern fs_handle_t fs_name_to_handle(char *, bool);
+extern fs_handle_t fs_name_to_handle(unsigned int instance, char *, bool);
 extern vfs_info_t *fs_handle_to_info(fs_handle_t);
 
@@ -219 +220 @@
 extern void vfs_rename(ipc_callid_t, ipc_call_t *);
 extern void vfs_wait_handle(ipc_callid_t, ipc_call_t *);
+extern void vfs_get_mtab(ipc_callid_t, ipc_call_t *);
 
 #endif