Changeset 8ff0bd2 in mainline for uspace/srv/vfs/vfs_lookup.c

Timestamp:

2011-09-04T11:30:58Z (13 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

03bc76a

Parents:

d2c67e7 (diff), deac215e (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/vfs/vfs_lookup.c (modified) (6 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);
@@ -162 +162 @@
         aid_t req = async_send_5(exch, VFS_OUT_LOOKUP, (sysarg_t) first,
             (sysarg_t) (first + len - 1) % PLB_SIZE,
-            (sysarg_t) root->devmap_handle, (sysarg_t) lflag, (sysarg_t) index,
+            (sysarg_t) root->service_id, (sysarg_t) lflag, (sysarg_t) index,
             &answer);
         
@@ -185 +185 @@
         
         result->triplet.fs_handle = (fs_handle_t) rc;
-        result->triplet.devmap_handle = (devmap_handle_t) IPC_GET_ARG1(answer);
+        result->triplet.service_id = (service_id_t) IPC_GET_ARG1(answer);
         result->triplet.index = (fs_index_t) IPC_GET_ARG2(answer);
         result->size =
@@ -201 +201 @@
 }
 
-/** Perform a node open operation.
- *
- * @return EOK on success or an error code from errno.h.
- *
- */
-int vfs_open_node_internal(vfs_lookup_res_t *result)
-{
-        async_exch_t *exch = vfs_exchange_grab(result->triplet.fs_handle);
-        
-        ipc_call_t answer;
-        aid_t req = async_send_2(exch, VFS_OUT_OPEN_NODE,
-            (sysarg_t) result->triplet.devmap_handle,
-            (sysarg_t) result->triplet.index, &answer);
-        
-        sysarg_t rc;
-        async_wait_for(req, &rc);
-        vfs_exchange_release(exch);
-        
-        if (rc == EOK) {
-                result->size =
-                    MERGE_LOUP32(IPC_GET_ARG1(answer), IPC_GET_ARG2(answer));
-                result->lnkcnt = (unsigned int) IPC_GET_ARG3(answer);
-                if (IPC_GET_ARG4(answer) & L_FILE)
-                        result->type = VFS_NODE_FILE;
-                else if (IPC_GET_ARG4(answer) & L_DIRECTORY)
-                        result->type = VFS_NODE_DIRECTORY;
-                else
-                        result->type = VFS_NODE_UNKNOWN;
-        }
-        
-        return rc;
-}
-
 /**
  * @}