Changeset c31d773 in mainline

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.

Location:

uspace/srv/vfs

Files:

• vfs.h (modified) (4 diffs)
• vfs_lookup.c (modified) (1 diff)
• vfs_node.c (modified) (2 diffs)
• vfs_ops.c (modified) (6 diffs)

uspace/srv/vfs/vfs.h

@@ -36 +36 @@
 #include <ipc/ipc.h>
 #include <libadt/list.h>
-#include <atomic.h>
+#include <futex.h>
 #include <rwlock.h>
 #include <sys/types.h>
@@ -108 +108 @@
         vfs_info_t vfs_info;
         int fs_handle;
-        atomic_t phone_futex;   /**< Phone serializing futex. */
+        futex_t phone_futex;    /**< Phone serializing futex. */
         ipcarg_t phone;
 } fs_info_t;
@@ -233 +233 @@
 } vfs_file_t;
 
+extern futex_t nodes_futex;
+
 extern link_t fs_head;          /**< List of registered file systems. */
 
@@ -248 +250 @@
 } plb_entry_t;
 
-extern atomic_t plb_futex;      /**< Futex protecting plb and plb_head. */
+extern futex_t plb_futex;       /**< Futex protecting plb and plb_head. */
 extern uint8_t *plb;            /**< Path Lookup Buffer */
 extern link_t plb_head;         /**< List of active PLB entries. */

uspace/srv/vfs/vfs_lookup.c

@@ -45 +45 @@
 #include <futex.h>
 #include <libadt/list.h>
-#include <atomic.h>
 #include <vfs/canonify.h>
 
 #define min(a, b)       ((a) < (b) ? (a) : (b))
 
-atomic_t plb_futex = FUTEX_INITIALIZER;
+futex_t plb_futex = FUTEX_INITIALIZER;
 link_t plb_head;        /**< PLB entry ring buffer. */
 uint8_t *plb = NULL;

uspace/srv/vfs/vfs_node.c

@@ -39 +39 @@
 #include <stdlib.h>
 #include <string.h>
-#include <atomic.h>
 #include <futex.h>
 #include <rwlock.h>
@@ -48 +47 @@
 
 /** Futex protecting the VFS node hash table. */
-atomic_t nodes_futex = FUTEX_INITIALIZER;
+futex_t nodes_futex = FUTEX_INITIALIZER;
 
 #define NODES_BUCKETS_LOG       8

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);