Changeset 553492be in mainline for uspace/srv/vfs/vfs_ops.c

Timestamp:

2009-06-17T22:33:08Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

ac47b7c2

Parents:

ca093b3

Message:

Finish converting VFS to fibril synchronization.

File:

• uspace/srv/vfs/vfs_ops.c (modified) (5 diffs)

uspace/srv/vfs/vfs_ops.c

@@ -44 +44 @@
 #include <string.h>
 #include <bool.h>
-#include <futex.h>
 #include <fibril_sync.h>
 #include <adt/list.h>
@@ -1132 +1131 @@
          */
         vfs_node_t *node = vfs_node_get(&lr);
-        futex_down(&nodes_futex);
+        fibril_mutex_lock(&nodes_mutex);
         node->lnkcnt--;
-        futex_up(&nodes_futex);
+        fibril_mutex_unlock(&nodes_mutex);
         fibril_rwlock_write_unlock(&namespace_rwlock);
         vfs_node_put(node);
@@ -1283 +1282 @@
                         return;
                 }
-                futex_down(&nodes_futex);
+                fibril_mutex_lock(&nodes_mutex);
                 new_node->lnkcnt--;
-                futex_up(&nodes_futex);
+                fibril_mutex_unlock(&nodes_mutex);
                 break;
         default:
@@ -1305 +1304 @@
                 return;
         }
-        futex_down(&nodes_futex);
+        fibril_mutex_lock(&nodes_mutex);
         old_node->lnkcnt++;
-        futex_up(&nodes_futex);
+        fibril_mutex_unlock(&nodes_mutex);
         /* Destroy the link for the old name. */
         rc = vfs_lookup_internal(oldc, L_UNLINK, NULL, NULL);
@@ -1320 +1319 @@
                 return;
         }
-        futex_down(&nodes_futex);
+        fibril_mutex_lock(&nodes_mutex);
         old_node->lnkcnt--;
-        futex_up(&nodes_futex);
+        fibril_mutex_unlock(&nodes_mutex);
         fibril_rwlock_write_unlock(&namespace_rwlock);
         vfs_node_put(old_node);