Changeset cac458f in mainline for uspace/srv/fs/tmpfs/tmpfs_ops.c

Timestamp:

2011-06-22T01:59:39Z (14 years ago)

Author:

Petr Koupy <petr.koupy@…>

Branches:

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

Children:

41e2118

Parents:

79506d6 (diff), f1fae414 (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 changes.

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