Changeset 827d73f in mainline for uspace/srv/vfs/vfs_lookup.c

Timestamp:

2010-02-12T14:09:22Z (14 years ago)

Author:

Lukas Mejdrech <lukasmejdrech@…>

Branches:

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

Children:

a70bda4

Parents:

918e9910 (diff), e70edd1 (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:

Merged the actual head

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>
@@ -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)) {
@@ -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)
-                        result->type = VFS_NODE_FILE;
-                else if (lflag & L_DIRECTORY)
-                        result->type = VFS_NODE_DIRECTORY;
-                else
-                        result->type = VFS_NODE_UNKNOWN;
-        }
-
-        return rc;
+        
+        if (((int) rc < EOK) || (!result))
+                return (int) rc;
+        
+        result->triplet.fs_handle = (fs_handle_t) rc;
+        result->triplet.dev_handle = (dev_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;
 }
 
@@ -214 +218 @@
         
         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->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_ARG3(answer) & L_DIRECTORY)
+                else if (IPC_GET_ARG4(answer) & L_DIRECTORY)
                         result->type = VFS_NODE_DIRECTORY;
                 else