Changeset c621f4aa in mainline for uspace/srv/fs/devfs/devfs_ops.c

Timestamp:

2010-07-25T10:11:13Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

377cce8

Parents:

24a2517 (diff), a2da43c (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 with mainline.

File:

• uspace/srv/fs/devfs/devfs_ops.c (modified) (4 diffs)

uspace/srv/fs/devfs/devfs_ops.c

@@ -37 +37 @@
 
 #include <ipc/ipc.h>
+#include <macros.h>
 #include <bool.h>
 #include <errno.h>
 #include <malloc.h>
-#include <string.h>
+#include <str.h>
 #include <libfs.h>
 #include <fibril_synch.h>
@@ -337 +338 @@
 }
 
-static size_t devfs_size_get(fs_node_t *fn)
+static aoff64_t devfs_size_get(fs_node_t *fn)
 {
         return 0;
@@ -463 +464 @@
 {
         fs_index_t index = (fs_index_t) IPC_GET_ARG2(*request);
-        off_t pos = (off_t) IPC_GET_ARG3(*request);
+        aoff64_t pos =
+            (aoff64_t) MERGE_LOUP32(IPC_GET_ARG3(*request), IPC_GET_ARG4(*request));
         
         if (index == 0) {
@@ -597 +599 @@
 {
         fs_index_t index = (fs_index_t) IPC_GET_ARG2(*request);
-        off_t pos = (off_t) IPC_GET_ARG3(*request);
-        
         if (index == 0) {
                 ipc_answer_0(rid, ENOTSUP);