Changes in uspace/srv/vfs/vfs_lookup.c [1e4cada:991f645] in mainline

File:

• uspace/srv/vfs/vfs_lookup.c (modified) (4 diffs)

uspace/srv/vfs/vfs_lookup.c

@@ -38 +38 @@
 #include "vfs.h"
 #include <ipc/ipc.h>
+#include <macros.h>
 #include <async.h>
 #include <errno.h>
-#include <string.h>
+#include <str.h>
 #include <stdarg.h>
 #include <bool.h>
@@ -99 +100 @@
         entry.len = len;
 
-        off_t first;    /* the first free index */
-        off_t last;     /* the last free index */
+        size_t first;   /* the first free index */
+        size_t last;    /* the last free index */
 
         if (list_empty(&plb_head)) {
@@ -162 +163 @@
         aid_t req = async_send_5(phone, VFS_OUT_LOOKUP, (ipcarg_t) first,
             (ipcarg_t) (first + len - 1) % PLB_SIZE,
-            (ipcarg_t) root->dev_handle, (ipcarg_t) lflag, (ipcarg_t) index,
+            (ipcarg_t) root->devmap_handle, (ipcarg_t) lflag, (ipcarg_t) index,
             &answer);
         
         ipcarg_t rc;
         async_wait_for(req, &rc);
-        vfs_release_phone(phone);
+        vfs_release_phone(root->fs_handle, phone);
         
         fibril_mutex_lock(&plb_mutex);
@@ -177 +178 @@
         memset(plb, 0, cnt2);
         fibril_mutex_unlock(&plb_mutex);
-
-        if ((rc == EOK) && (result)) {
-                result->triplet.fs_handle = (fs_handle_t) IPC_GET_ARG1(answer);
-                result->triplet.dev_handle = (dev_handle_t) IPC_GET_ARG2(answer);
-                result->triplet.index = (fs_index_t) IPC_GET_ARG3(answer);
-                result->size = (size_t) IPC_GET_ARG4(answer);
-                result->lnkcnt = (unsigned) IPC_GET_ARG5(answer);
-                if (lflag & L_FILE)
+        
+        if (((int) rc < EOK) || (!result))
+                return (int) rc;
+        
+        result->triplet.fs_handle = (fs_handle_t) rc;
+        result->triplet.devmap_handle = (devmap_handle_t) IPC_GET_ARG1(answer);
+        result->triplet.index = (fs_index_t) IPC_GET_ARG2(answer);
+        result->size =
+            (aoff64_t) MERGE_LOUP32(IPC_GET_ARG3(answer), IPC_GET_ARG4(answer));
+        result->lnkcnt = (unsigned int) IPC_GET_ARG5(answer);
+        
+        if (lflag & L_FILE)
+                result->type = VFS_NODE_FILE;
+        else if (lflag & L_DIRECTORY)
+                result->type = VFS_NODE_DIRECTORY;
+        else
+                result->type = VFS_NODE_UNKNOWN;
+        
+        return EOK;
+}
+
+/** 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)
+{
+        int phone = vfs_grab_phone(result->triplet.fs_handle);
+        
+        ipc_call_t answer;
+        aid_t req = async_send_2(phone, VFS_OUT_OPEN_NODE,
+            (ipcarg_t) result->triplet.devmap_handle,
+            (ipcarg_t) result->triplet.index, &answer);
+        
+        ipcarg_t rc;
+        async_wait_for(req, &rc);
+        vfs_release_phone(result->triplet.fs_handle, phone);
+        
+        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 (lflag & L_DIRECTORY)
+                else if (IPC_GET_ARG4(answer) & L_DIRECTORY)
                         result->type = VFS_NODE_DIRECTORY;
                 else
                         result->type = VFS_NODE_UNKNOWN;
         }
-
+        
         return rc;
 }
 
-/** 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)
-{
-        int phone = vfs_grab_phone(result->triplet.fs_handle);
-        
-        ipc_call_t answer;
-        aid_t req = async_send_2(phone, VFS_OUT_OPEN_NODE,
-            (ipcarg_t) result->triplet.dev_handle,
-            (ipcarg_t) result->triplet.index, &answer);
-        
-        ipcarg_t rc;
-        async_wait_for(req, &rc);
-        vfs_release_phone(phone);
-        
-        if (rc == EOK) {
-                result->size = (size_t) IPC_GET_ARG1(answer);
-                result->lnkcnt = (unsigned) IPC_GET_ARG2(answer);
-                if (IPC_GET_ARG3(answer) & L_FILE)
-                        result->type = VFS_NODE_FILE;
-                else if (IPC_GET_ARG3(answer) & L_DIRECTORY)
-                        result->type = VFS_NODE_DIRECTORY;
-                else
-                        result->type = VFS_NODE_UNKNOWN;
-        }
-        
-        return rc;
-}
-
 /**
  * @}