Changes in uspace/srv/fs/tmpfs/tmpfs_ops.c [b72efe8:ffa2c8ef] in mainline

File:

• uspace/srv/fs/tmpfs/tmpfs_ops.c (modified) (12 diffs)

uspace/srv/fs/tmpfs/tmpfs_ops.c

@@ -85 +85 @@
 static int tmpfs_has_children(bool *has_children, fs_node_t *fn)
 {
-        *has_children = !list_empty(&TMPFS_NODE(fn)->cs_list);
+        *has_children = !list_empty(&TMPFS_NODE(fn)->cs_head);
         return EOK;
 }
@@ -180 +180 @@
             nh_link);
 
-        while (!list_empty(&nodep->cs_list)) {
-                tmpfs_dentry_t *dentryp = list_get_instance(
-                    list_first(&nodep->cs_list), tmpfs_dentry_t, link);
+        while (!list_empty(&nodep->cs_head)) {
+                tmpfs_dentry_t *dentryp = list_get_instance(nodep->cs_head.next,
+                    tmpfs_dentry_t, link);
 
                 assert(nodep->type == TMPFS_DIRECTORY);
@@ -214 +214 @@
         nodep->data = NULL;
         link_initialize(&nodep->nh_link);
-        list_initialize(&nodep->cs_list);
+        list_initialize(&nodep->cs_head);
 }
 
@@ -262 +262 @@
 {
         tmpfs_node_t *parentp = TMPFS_NODE(pfn);
-
-        list_foreach(parentp->cs_list, lnk) {
+        link_t *lnk;
+
+        for (lnk = parentp->cs_head.next; lnk != &parentp->cs_head;
+            lnk = lnk->next) {
                 tmpfs_dentry_t *dentryp;
                 dentryp = list_get_instance(lnk, tmpfs_dentry_t, link);
@@ -351 +353 @@
         
         assert(!nodep->lnkcnt);
-        assert(list_empty(&nodep->cs_list));
+        assert(list_empty(&nodep->cs_head));
 
         unsigned long key[] = {
@@ -371 +373 @@
         tmpfs_node_t *childp = TMPFS_NODE(cfn);
         tmpfs_dentry_t *dentryp;
+        link_t *lnk;
 
         assert(parentp->type == TMPFS_DIRECTORY);
 
         /* Check for duplicit entries. */
-        list_foreach(parentp->cs_list, lnk) {
+        for (lnk = parentp->cs_head.next; lnk != &parentp->cs_head;
+            lnk = lnk->next) {
                 dentryp = list_get_instance(lnk, tmpfs_dentry_t, link); 
                 if (!str_cmp(dentryp->name, nm))
@@ -397 +401 @@
         dentryp->node = childp;
         childp->lnkcnt++;
-        list_append(&dentryp->link, &parentp->cs_list);
+        list_append(&dentryp->link, &parentp->cs_head);
 
         return EOK;
@@ -407 +411 @@
         tmpfs_node_t *childp = NULL;
         tmpfs_dentry_t *dentryp;
+        link_t *lnk;
 
         if (!parentp)
                 return EBUSY;
         
-        list_foreach(parentp->cs_list, lnk) {
+        for (lnk = parentp->cs_head.next; lnk != &parentp->cs_head;
+            lnk = lnk->next) {
                 dentryp = list_get_instance(lnk, tmpfs_dentry_t, link);
                 if (!str_cmp(dentryp->name, nm)) {
@@ -417 +423 @@
                         assert(FS_NODE(childp) == cfn);
                         break;
-                }
+                }       
         }
 
@@ -423 +429 @@
                 return ENOENT;
                 
-        if ((childp->lnkcnt == 1) && !list_empty(&childp->cs_list))
+        if ((childp->lnkcnt == 1) && !list_empty(&childp->cs_head))
                 return ENOTEMPTY;
 
@@ -544 +550 @@
                 tmpfs_dentry_t *dentryp;
                 link_t *lnk;
+                aoff64_t i;
                 
                 assert(nodep->type == TMPFS_DIRECTORY);
@@ -552 +559 @@
                  * hash table.
                  */
-                lnk = list_nth(&nodep->cs_list, pos);
-                
-                if (lnk == NULL) {
+                for (i = 0, lnk = nodep->cs_head.next;
+                    (i < pos) && (lnk != &nodep->cs_head);
+                    i++, lnk = lnk->next)
+                        ;
+
+                if (lnk == &nodep->cs_head) {
                         async_answer_0(callid, ENOENT);
                         async_answer_1(rid, ENOENT, 0);