Changeset c028b22 in mainline for uspace/srv/fs/tmpfs

Timestamp:

2011-07-08T17:01:01Z (15 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

Location:

uspace/srv/fs/tmpfs

Files:

• tmpfs.c (modified) (7 diffs)
• tmpfs.h (modified) (1 diff)
• tmpfs_dump.c (modified) (1 diff)
• tmpfs_ops.c (modified) (12 diffs)

uspace/srv/fs/tmpfs/tmpfs.c

@@ -30 +30 @@
 /** @addtogroup fs
  * @{
- */ 
+ */
 
 /**
@@ -43 +43 @@
 #include "tmpfs.h"
 #include <ipc/services.h>
-#include <ipc/ns.h>
+#include <ns.h>
 #include <async.h>
 #include <errno.h>
@@ -82 +82 @@
  * request has been completed.
  */
-static void tmpfs_connection(ipc_callid_t iid, ipc_call_t *icall)
+static void tmpfs_connection(ipc_callid_t iid, ipc_call_t *icall, void *arg)
 {
         if (iid) {
@@ -94 +94 @@
         
         dprintf(NAME ": connection opened\n");
-        while (1) {
-                ipc_callid_t callid;
+        
+        while (true) {
                 ipc_call_t call;
-        
-                callid = async_get_call(&call);
-                switch  (IPC_GET_IMETHOD(call)) {
-                case IPC_M_PHONE_HUNGUP:
+                ipc_callid_t callid = async_get_call(&call);
+                
+                if (!IPC_GET_IMETHOD(call))
                         return;
+                
+                switch (IPC_GET_IMETHOD(call)) {
                 case VFS_OUT_MOUNTED:
                         tmpfs_mounted(callid, &call);
@@ -151 +152 @@
 {
         printf(NAME ": HelenOS TMPFS file system server\n");
-
+        
         if (!tmpfs_init()) {
                 printf(NAME ": failed to initialize TMPFS\n");
                 return -1;
         }
-
-        int vfs_phone = service_connect_blocking(SERVICE_VFS, 0, 0);
-        if (vfs_phone < EOK) {
+        
+        async_sess_t *vfs_sess = service_connect_blocking(EXCHANGE_SERIALIZE,
+            SERVICE_VFS, 0, 0);
+        if (!vfs_sess) {
                 printf(NAME ": Unable to connect to VFS\n");
                 return -1;
         }
-
-        int rc = fs_register(vfs_phone, &tmpfs_reg, &tmpfs_vfs_info,
+        
+        int rc = fs_register(vfs_sess, &tmpfs_reg, &tmpfs_vfs_info,
             tmpfs_connection);
         if (rc != EOK) {
@@ -169 +171 @@
                 return rc;
         }
-
+        
         printf(NAME ": Accepting connections\n");
         task_retval(0);
         async_manager();
-        /* not reached */
+        
+        /* Not reached */
         return 0;
 }
@@ -179 +182 @@
 /**
  * @}
- */ 
+ */

uspace/srv/fs/tmpfs/tmpfs.h

@@ -67 +67 @@
         size_t size;            /**< File size if type is TMPFS_FILE. */
         void *data;             /**< File content's if type is TMPFS_FILE. */
-        link_t cs_head;         /**< Head of child's siblings list. */
+        list_t cs_list;         /**< Child's siblings list. */
 } tmpfs_node_t;
 

uspace/srv/fs/tmpfs/tmpfs_dump.c

@@ -167 +167 @@
         int rc;
 
-        rc = block_init(dev, TMPFS_COMM_SIZE);
+        rc = block_init(EXCHANGE_SERIALIZE, dev, TMPFS_COMM_SIZE);
         if (rc != EOK)
                 return false; 

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