Changeset c028b22 in mainline for uspace/srv/fs/fat/fat_ops.c

Timestamp:

2011-07-08T17:01:01Z (13 years ago)

Author:

Martin Sucha <sucha14@…>

Branches:

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

Children:

cc1a727

Parents:

4e36219 (diff), 026793d (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/fs/fat/fat_ops.c (modified) (7 diffs)

uspace/srv/fs/fat/fat_ops.c

@@ -67 +67 @@
 
 /** List of cached free FAT nodes. */
-static LIST_INITIALIZE(ffn_head);
+static LIST_INITIALIZE(ffn_list);
 
 /*
@@ -147 +147 @@
 static int fat_node_fini_by_devmap_handle(devmap_handle_t devmap_handle)
 {
-        link_t *lnk;
         fat_node_t *nodep;
         int rc;
@@ -159 +158 @@
 restart:
         fibril_mutex_lock(&ffn_mutex);
-        for (lnk = ffn_head.next; lnk != &ffn_head; lnk = lnk->next) {
+        list_foreach(ffn_list, lnk) {
                 nodep = list_get_instance(lnk, fat_node_t, ffn_link);
                 if (!fibril_mutex_trylock(&nodep->lock)) {
@@ -196 +195 @@
                 free(nodep);
 
-                /* Need to restart because we changed the ffn_head list. */
+                /* Need to restart because we changed ffn_list. */
                 goto restart;
         }
@@ -211 +210 @@
 
         fibril_mutex_lock(&ffn_mutex);
-        if (!list_empty(&ffn_head)) {
+        if (!list_empty(&ffn_list)) {
                 /* Try to use a cached free node structure. */
                 fat_idx_t *idxp_tmp;
-                nodep = list_get_instance(ffn_head.next, fat_node_t, ffn_link);
+                nodep = list_get_instance(list_first(&ffn_list), fat_node_t,
+                    ffn_link);
                 if (!fibril_mutex_trylock(&nodep->lock))
                         goto skip_cache;
@@ -473 +473 @@
                 if (nodep->idx) {
                         fibril_mutex_lock(&ffn_mutex);
-                        list_append(&nodep->ffn_link, &ffn_head);
+                        list_append(&nodep->ffn_link, &ffn_list);
                         fibril_mutex_unlock(&ffn_mutex);
                 } else {
@@ -970 +970 @@
 
         /* initialize libblock */
-        rc = block_init(devmap_handle, BS_SIZE);
+        rc = block_init(EXCHANGE_SERIALIZE, devmap_handle, BS_SIZE);
         if (rc != EOK) {
                 async_answer_0(rid, rc);