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

Timestamp:

2008-03-09T19:55:42Z (17 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

088cecc

Parents:

c089919

Message:

Grab the nodes_futex when manipulating node link counts in rename() and
_unlink().

Fix VFS futex definitions and declarations by replacing atomic_t by futex_t.

File:

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

uspace/srv/vfs/vfs_ops.c

@@ -51 +51 @@
 #include <fcntl.h>
 #include <assert.h>
-#include <atomic.h>
 #include <vfs/canonify.h>
 
@@ -63 +62 @@
 RWLOCK_INITIALIZE(namespace_rwlock);
 
-atomic_t rootfs_futex = FUTEX_INITIALIZER;
+futex_t rootfs_futex = FUTEX_INITIALIZER;
 vfs_triplet_t rootfs = {
         .fs_handle = 0,
@@ -687 +686 @@
          */
         vfs_node_t *node = vfs_node_get(&lr);
+        futex_down(&nodes_futex);
         node->lnkcnt--;
+        futex_up(&nodes_futex);
         rwlock_write_unlock(&namespace_rwlock);
         vfs_node_put(node);
@@ -811 +812 @@
                         return;
                 }
+                futex_down(&nodes_futex);
                 new_node->lnkcnt--;
+                futex_up(&nodes_futex);
                 break;
         default:
@@ -831 +834 @@
                 return;
         }
+        futex_down(&nodes_futex);
         old_node->lnkcnt++;
+        futex_up(&nodes_futex);
         /* Destroy the link for the old name. */
         rc = vfs_lookup_internal(oldc, L_UNLINK, NULL, NULL);
@@ -844 +849 @@
                 return;
         }
+        futex_down(&nodes_futex);
         old_node->lnkcnt--;
+        futex_up(&nodes_futex);
         rwlock_write_unlock(&namespace_rwlock);
         vfs_node_put(old_node);