Changeset f1fae414 in mainline for uspace/srv/vfs/vfs_ops.c

Timestamp:

2011-06-22T01:34:53Z (13 years ago)

Author:

Petr Koupy <petr.koupy@…>

Branches:

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

Children:

8d7e82c1, cac458f

Parents:

72ec8cc (diff), bf172825 (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_ops.c (modified) (3 diffs)

uspace/srv/vfs/vfs_ops.c

@@ -325 +325 @@
          * This will also give us its file system handle.
          */
-        fibril_mutex_lock(&fs_head_lock);
+        fibril_mutex_lock(&fs_list_lock);
         fs_handle_t fs_handle;
 recheck:
@@ -331 +331 @@
         if (!fs_handle) {
                 if (flags & IPC_FLAG_BLOCKING) {
-                        fibril_condvar_wait(&fs_head_cv, &fs_head_lock);
+                        fibril_condvar_wait(&fs_list_cv, &fs_list_lock);
                         goto recheck;
                 }
                 
-                fibril_mutex_unlock(&fs_head_lock);
+                fibril_mutex_unlock(&fs_list_lock);
                 async_answer_0(callid, ENOENT);
                 async_answer_0(rid, ENOENT);
@@ -343 +343 @@
                 return;
         }
-        fibril_mutex_unlock(&fs_head_lock);
+        fibril_mutex_unlock(&fs_list_lock);
         
         /* Acknowledge that we know fs_name. */