Changeset 6843a9c in mainline for uspace/srv/vfs/vfs.h

Timestamp:

2012-06-29T13:02:14Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

722912e

Parents:

ba72f2b (diff), 0bbd13e (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

Trivial conflicts.

File:

• uspace/srv/vfs/vfs.h (modified) (3 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. */
 
@@ -162 +165 @@
 extern uint8_t *plb;            /**< Path Lookup Buffer */
 extern list_t plb_entries;      /**< List of active PLB entries. */
-
-#define MAX_MNTOPTS_LEN         256
 
 /** Holding this rwlock prevents changes in file system namespace. */ 
@@ -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