Changes in uspace/srv/vfs/vfs_ops.c [6371eb47:951e451] in mainline

File:

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

uspace/srv/vfs/vfs_ops.c

@@ -90 +90 @@
         errno_t rc;
 
-        /* If the file descriptors are the same, do nothing. */
-        if (oldfd == newfd)
-                return EOK;
-
         /* Lookup the file structure corresponding to fd. */
         vfs_file_t *oldfile = vfs_file_get(oldfd);
@@ -100 +96 @@
 
         assert(oldfile->node != NULL);
+
+        /* If the file descriptors are the same, do nothing. */
+        if (oldfd == newfd) {
+                vfs_file_put(oldfile);
+                return EOK;
+        }
 
         if (newfd != -1) {
@@ -168 +170 @@
         res.triplet.fs_handle = fs_handle;
         res.triplet.service_id = service_id;
-        res.triplet.index = (fs_index_t) IPC_GET_ARG1(answer);
-        res.size = (int64_t) MERGE_LOUP32(IPC_GET_ARG2(answer),
-            IPC_GET_ARG3(answer));
+        res.triplet.index = (fs_index_t) ipc_get_arg1(&answer);
+        res.size = (int64_t) MERGE_LOUP32(ipc_get_arg2(&answer),
+            ipc_get_arg3(&answer));
         res.type = VFS_NODE_DIRECTORY;
 
@@ -374 +376 @@
         }
 
-        *bytes = IPC_GET_ARG1(*answer);
+        *bytes = ipc_get_arg1(answer);
         return rc;
 }
@@ -401 +403 @@
         async_wait_for(msg, &rc);
 
-        chunk->size = IPC_GET_ARG1(*answer);
+        chunk->size = ipc_get_arg1(answer);
 
         return (errno_t) rc;
@@ -488 +490 @@
                 /* Update the cached version of node's size. */
                 if (rc == EOK) {
-                        file->node->size = MERGE_LOUP32(IPC_GET_ARG2(answer),
-                            IPC_GET_ARG3(answer));
+                        file->node->size = MERGE_LOUP32(ipc_get_arg2(&answer),
+                            ipc_get_arg3(&answer));
                 }
                 fibril_rwlock_write_unlock(&file->node->contents_rwlock);
@@ -616 +618 @@
                 return EBADF;
 
+        if (!file->open_write || file->node->type != VFS_NODE_FILE) {
+                vfs_file_put(file);
+                return EINVAL;
+        }
+
         fibril_rwlock_write_lock(&file->node->contents_rwlock);
 
@@ -637 +644 @@
 
         async_exch_t *exch = vfs_exchange_grab(node->fs_handle);
-        errno_t rc = async_data_read_forward_fast(exch, VFS_OUT_STAT,
-            node->service_id, node->index, true, 0, NULL);
+        errno_t rc = async_data_read_forward_3_0(exch, VFS_OUT_STAT,
+            node->service_id, node->index, true);
         vfs_exchange_release(exch);
 
@@ -654 +661 @@
 
         async_exch_t *exch = vfs_exchange_grab(node->fs_handle);
-        errno_t rc = async_data_read_forward_fast(exch, VFS_OUT_STATFS,
-            node->service_id, node->index, false, 0, NULL);
+        errno_t rc = async_data_read_forward_3_0(exch, VFS_OUT_STATFS,
+            node->service_id, node->index, false);
         vfs_exchange_release(exch);