Changeset 3842a955 in mainline for uspace/srv/vfs/vfs.h

Timestamp:

2011-06-19T15:59:42Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

26e7d6d

Parents:

9724d7f (diff), 74464e8 (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) (2 diffs)

uspace/srv/vfs/vfs.h

@@ -145 +145 @@
 extern fibril_mutex_t nodes_mutex;
 
-extern fibril_condvar_t fs_head_cv;
-extern fibril_mutex_t fs_head_lock;
-extern link_t fs_head;          /**< List of registered file systems. */
+extern fibril_condvar_t fs_list_cv;
+extern fibril_mutex_t fs_list_lock;
+extern list_t fs_list;          /**< List of registered file systems. */
 
 extern vfs_pair_t rootfs;       /**< Root file system. */
@@ -158 +158 @@
 } plb_entry_t;
 
-extern fibril_mutex_t plb_mutex;/**< Mutex protecting plb and plb_head. */
+extern fibril_mutex_t plb_mutex;/**< Mutex protecting plb and plb_entries. */
 extern uint8_t *plb;            /**< Path Lookup Buffer */
-extern link_t plb_head;         /**< List of active PLB entries. */
+extern list_t plb_entries;      /**< List of active PLB entries. */
 
 #define MAX_MNTOPTS_LEN         256