Changeset f7017572 in mainline for uspace/srv

Timestamp:

2008-01-27T18:54:16Z (17 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

acfdcb0

Parents:

15b9970

Message:

VFS_WRITE and tmpfs_write fixes.

Location:

uspace/srv

Files:

• fs/tmpfs/tmpfs.c (modified) (1 diff)
• fs/tmpfs/tmpfs_ops.c (modified) (2 diffs)
• vfs/vfs_ops.c (modified) (2 diffs)

uspace/srv/fs/tmpfs/tmpfs.c

@@ -116 +116 @@
                         tmpfs_read(callid, &call);
                         break;
+                case VFS_WRITE:
+                        tmpfs_write(callid, &call);
+                        break;
                 default:
                         ipc_answer_0(callid, ENOTSUP);

uspace/srv/fs/tmpfs/tmpfs_ops.c

@@ -498 +498 @@
                 /* The file size is not changing. */
                 (void) ipc_data_write_finalize(callid, dentry->data + pos, len);
-                ipc_answer_1(rid, EOK, len);
+                ipc_answer_2(rid, EOK, len, dentry->size);
                 return;
         }
@@ -512 +512 @@
         if (!newdata) {
                 ipc_answer_0(callid, ENOMEM);
-                ipc_answer_1(rid, EOK, 0);
+                ipc_answer_2(rid, EOK, 0, dentry->size);
                 return;
         }

uspace/srv/vfs/vfs_ops.c

@@ -371 +371 @@
         vfs_file_t *file = vfs_file_get(fd);
         file->node = node;
-        if (oflag & O_APPEND)
+        if (oflag & O_APPEND) 
                 file->append = true;
 
@@ -471 +471 @@
         else {
                 /* Update the cached version of node's size. */
-                file->node->size = IPC_GET_ARG2(answer); 
+                if (rc == EOK)
+                        file->node->size = IPC_GET_ARG2(answer); 
                 rwlock_write_unlock(&file->node->contents_rwlock);
         }
 
         /* Update the position pointer and unlock the open file. */
-        file->pos += bytes;
+        if (rc == EOK)
+                file->pos += bytes;
         futex_up(&file->lock);