Changeset e4f8c77 in mainline for uspace/srv/vfs/vfs_lookup.c

Timestamp:

2011-07-13T22:39:18Z (13 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

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

Children:

e6910c8

Parents:

5974661 (diff), 8ecef91 (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 libposix.

File:

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

uspace/srv/vfs/vfs_lookup.c

@@ -50 +50 @@
 
 FIBRIL_MUTEX_INITIALIZE(plb_mutex);
-LIST_INITIALIZE(plb_head);      /**< PLB entry ring buffer. */
+LIST_INITIALIZE(plb_entries);   /**< PLB entry ring buffer. */
 uint8_t *plb = NULL;
 
@@ -102 +102 @@
         size_t last;    /* the last free index */
 
-        if (list_empty(&plb_head)) {
+        if (list_empty(&plb_entries)) {
                 first = 0;
                 last = PLB_SIZE - 1;
         } else {
-                plb_entry_t *oldest = list_get_instance(plb_head.next,
-                    plb_entry_t, plb_link);
-                plb_entry_t *newest = list_get_instance(plb_head.prev,
-                    plb_entry_t, plb_link);
+                plb_entry_t *oldest = list_get_instance(
+                    list_first(&plb_entries), plb_entry_t, plb_link);
+                plb_entry_t *newest = list_get_instance(
+                    list_last(&plb_entries), plb_entry_t, plb_link);
 
                 first = (newest->index + newest->len) % PLB_SIZE;
@@ -145 +145 @@
          * buffer.
          */
-        list_append(&entry.plb_link, &plb_head);
+        list_append(&entry.plb_link, &plb_entries);
         
         fibril_mutex_unlock(&plb_mutex);