Changeset 368ee04 in mainline for uspace/srv/vfs/vfs_pager.c

Timestamp:

2017-04-05T18:10:39Z (8 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

93ad8166

Parents:

39f892a9 (diff), 2166728 (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 from lp:~jakub/helenos/vfs-2.5-cherrypick

This merge cherry-picks some of the changesets from Jiri Zarevucky's:

lp:~zarevucky-jiri/helenos/vfs-2.5

and then continues independently, yet sometime in a similar vein.

Roughly speaking, Jiri's branch is merged entirely up to its revision
1926 and then cherry-picked on and off until its revision 1965. Among
these changes are:

• relativization of the API,
• client-side roots,
• server-side mounts,
• inbox for passing arbitrary files from parent to child,
• some streamlining and cleanup.

Additional changes include:

• addressing issues introduced by the above changes,
• client-side I/O cursors (file positions),
• all HelenOS file system APIs begin with the vfs_ prefix and can be used after including vfs/vfs.h,
• removal of some POSIX-ish headers and definitions,
• additional cleanup.

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 @@
         };
 
-        fibril_mutex_lock(&file->lock);
-        file->pos = offset;
-        fibril_mutex_unlock(&file->lock);
-
         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;
@@ -83 +73 @@
                         break;
                 total += chunk.size;
+                pos += chunk.size;
                 chunk.buffer += chunk.size;
                 chunk.size = page_size - total;
         } while (total < page_size);
-
-        vfs_file_put(file);
 
         async_answer_1(rid, rc, (sysarg_t) page);