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

Timestamp:

2017-03-24T20:31:54Z (8 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_pager.c (modified) (4 diffs)

uspace/srv/vfs/vfs_pager.c

@@ -50 +50 @@
         int rc;
 
-        vfs_file_t *file = vfs_file_get(fd);
-        if (!file) {
-                async_answer_0(rid, ENOENT);
-                return;
-        }
-
         page = as_area_create(AS_AREA_ANY, page_size,
             AS_AREA_READ | AS_AREA_WRITE | AS_AREA_CACHEABLE,
@@ -61 +55 @@
 
         if (page == AS_MAP_FAILED) {
-                vfs_file_put(file);
                 async_answer_0(rid, ENOMEM);
                 return;
@@ -71 +64 @@
         };
 
-        file->pos = offset;
-        vfs_file_put(file);
-
         size_t total = 0;
+        aoff64_t pos = offset;
         do {
-                rc = vfs_rdwr_internal(fd, true, &chunk);
+                rc = vfs_rdwr_internal(fd, pos, true, &chunk);
                 if (rc != EOK)
                         break;
@@ -82 +73 @@
                         break;
                 total += chunk.size;
+                pos += chunk.size;
                 chunk.buffer += chunk.size;
                 chunk.size = page_size - total;