Changeset 61c0402 in mainline for uspace/srv/vfs/vfs_ops.c

Timestamp:

2010-01-15T19:36:53Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

92bee46

Parents:

50f9c3a (diff), 963462af (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 mainline changes.

File:

• uspace/srv/vfs/vfs_ops.c (modified) (2 diffs)

uspace/srv/vfs/vfs_ops.c

@@ -44 +44 @@
 #include <string.h>
 #include <bool.h>
-#include <fibril_sync.h>
+#include <fibril_synch.h>
 #include <adt/list.h>
 #include <unistd.h>
@@ -900 +900 @@
                 }
                 newpos = size + off;
+                file->pos = newpos;
                 fibril_mutex_unlock(&file->lock);
                 ipc_answer_1(rid, EOK, newpos);