Changeset 58898d1d in mainline for uspace/srv/vfs/vfs_ipc.c

Timestamp:

2017-03-24T20:31:54Z (7 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

8e9b2534

Parents:

c9e3692

Message:

Remove VFS_IN_SEEK from VFS

File:

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

uspace/srv/vfs/vfs_ipc.c

@@ -122 +122 @@
 {
         int fd = IPC_GET_ARG1(*request);
+        aoff64_t pos = MERGE_LOUP32(IPC_GET_ARG2(*request),
+            IPC_GET_ARG3(*request));
 
         size_t bytes = 0;
-        int rc = vfs_op_read(fd, &bytes);
+        int rc = vfs_op_read(fd, pos, &bytes);
         async_answer_1(rid, rc, bytes);
 }
@@ -170 +172 @@
         if (new)
                 free(new);
-}
-
-static void vfs_in_seek(ipc_callid_t rid, ipc_call_t *request)
-{
-        int fd = (int) IPC_GET_ARG1(*request);
-        int64_t off = (int64_t) MERGE_LOUP32(IPC_GET_ARG2(*request), IPC_GET_ARG3(*request));
-        int whence = (int) IPC_GET_ARG4(*request);
-
-        int64_t new_offset = 0;
-        int rc = vfs_op_seek(fd, off, whence, &new_offset);
-        async_answer_2(rid, rc, LOWER32(new_offset), UPPER32(new_offset));
 }
 
@@ -256 +247 @@
 {
         int fd = IPC_GET_ARG1(*request);
+        aoff64_t pos = MERGE_LOUP32(IPC_GET_ARG2(*request),
+            IPC_GET_ARG3(*request));
 
         size_t bytes = 0;
-        int rc = vfs_op_write(fd, &bytes);
+        int rc = vfs_op_write(fd, pos, &bytes);
         async_answer_1(rid, rc, bytes);
 }
@@ -308 +301 @@
                         vfs_in_rename(callid, &call);
                         break;
-                case VFS_IN_SEEK:
-                        vfs_in_seek(callid, &call);
-                        break;
                 case VFS_IN_STATFS:
                         vfs_in_statfs(callid, &call);