Changeset 3f03199 in mainline for uspace/srv/vfs/vfs_register.c

Timestamp:

2013-09-15T06:33:53Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

9348862

Parents:

dd7078c (diff), 1c0cef0 (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.

Major conflicts in USB HC drivers.
Compiles and UHCI works (qemu).
OHCI has device remove problems.

File:

• uspace/srv/vfs/vfs_register.c (modified) (3 diffs)

uspace/srv/vfs/vfs_register.c

@@ -260 +260 @@
         fibril_mutex_lock(&fs_list_lock);
         
-        list_foreach(fs_list, cur) {
-                fs_info_t *fs = list_get_instance(cur, fs_info_t, fs_link);
-                
+        list_foreach(fs_list, fs_link, fs_info_t, fs) {
                 if (fs->fs_handle == handle) {
                         fibril_mutex_unlock(&fs_list_lock);
@@ -305 +303 @@
                 fibril_mutex_lock(&fs_list_lock);
         
-        list_foreach(fs_list, cur) {
-                fs_info_t *fs = list_get_instance(cur, fs_info_t, fs_link);
+        list_foreach(fs_list, fs_link, fs_info_t, fs) {
                 if (str_cmp(fs->vfs_info.name, name) == 0 &&
                     instance == fs->vfs_info.instance) {
@@ -332 +329 @@
         
         fibril_mutex_lock(&fs_list_lock);
-        list_foreach(fs_list, cur) {
-                fs_info_t *fs = list_get_instance(cur, fs_info_t, fs_link);
+        list_foreach(fs_list, fs_link, fs_info_t, fs) {
                 if (fs->fs_handle == handle) { 
                         info = &fs->vfs_info;