Changes in / [4b9a410:eb667613] in mainline

File:

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

uspace/srv/vfs/vfs_ops.c

@@ -55 +55 @@
 
 /* Forward declarations of static functions. */
-static int vfs_truncate_internal(fs_handle_t, devmap_handle_t, fs_index_t,
-    aoff64_t);
+static int vfs_truncate_internal(fs_handle_t, devmap_handle_t, fs_index_t, aoff64_t);
 
 /**
@@ -251 +250 @@
 void vfs_mount(ipc_callid_t rid, ipc_call_t *request)
 {
-        devmap_handle_t devmap_handle;
-
         /*
          * We expect the library to do the device-name to device-handle
@@ -258 +255 @@
          * in the request.
          */
-        devmap_handle = (devmap_handle_t) IPC_GET_ARG1(*request);
+        devmap_handle_t devmap_handle = (devmap_handle_t) IPC_GET_ARG1(*request);
         
         /*
@@ -294 +291 @@
          */
         char *fs_name;
-        rc = async_data_write_accept((void **) &fs_name, true, 0,
-            FS_NAME_MAXLEN, 0, NULL);
+        rc = async_data_write_accept((void **) &fs_name, true, 0, FS_NAME_MAXLEN,
+            0, NULL);
         if (rc != EOK) {
                 free(mp);
@@ -461 +458 @@
 
                 phone = vfs_grab_phone(mp_node->fs_handle);
-                rc = async_req_2_0(phone, VFS_OUT_UNMOUNT,
-                    mp_node->devmap_handle, mp_node->index);
+                rc = async_req_2_0(phone, VFS_OUT_UNMOUNT, mp_node->devmap_handle,
+                    mp_node->index);
                 vfs_release_phone(mp_node->fs_handle, phone);
                 if (rc != EOK) {
@@ -743 +740 @@
                 aid_t msg;
                 ipc_call_t answer;
-                msg = async_send_2(fs_phone, VFS_OUT_CLOSE,
-                    file->node->devmap_handle, file->node->index, &answer);
+                msg = async_send_2(fs_phone, VFS_OUT_CLOSE, file->node->devmap_handle,
+                    file->node->index, &answer);
                 
                 /* Wait for reply from the FS server. */
@@ -837 +834 @@
         ipc_call_t answer;
         if (read) {
+                if (file->append)
+                        file->pos = file->node->size;
+                
                 rc = async_data_read_forward_3_1(fs_phone, VFS_OUT_READ,
                     file->node->devmap_handle, file->node->index, file->pos,
                     &answer);
         } else {
-                if (file->append)
-                        file->pos = file->node->size;
-                
                 rc = async_data_write_forward_3_1(fs_phone, VFS_OUT_WRITE,
                     file->node->devmap_handle, file->node->index, file->pos,
@@ -891 +888 @@
 {
         int fd = (int) IPC_GET_ARG1(*request);
-        off64_t off = (off64_t) MERGE_LOUP32(IPC_GET_ARG2(*request),
-            IPC_GET_ARG3(*request));
+        off64_t off =
+            (off64_t) MERGE_LOUP32(IPC_GET_ARG2(*request), IPC_GET_ARG3(*request));
         int whence = (int) IPC_GET_ARG4(*request);
         
@@ -906 +903 @@
         off64_t newoff;
         switch (whence) {
-        case SEEK_SET:
-                if (off >= 0) {
-                        file->pos = (aoff64_t) off;
+                case SEEK_SET:
+                        if (off >= 0) {
+                                file->pos = (aoff64_t) off;
+                                fibril_mutex_unlock(&file->lock);
+                                ipc_answer_1(rid, EOK, off);
+                                return;
+                        }
+                        break;
+                case SEEK_CUR:
+                        if ((off >= 0) && (file->pos + off < file->pos)) {
+                                fibril_mutex_unlock(&file->lock);
+                                ipc_answer_0(rid, EOVERFLOW);
+                                return;
+                        }
+                        
+                        if ((off < 0) && (file->pos < (aoff64_t) -off)) {
+                                fibril_mutex_unlock(&file->lock);
+                                ipc_answer_0(rid, EOVERFLOW);
+                                return;
+                        }
+                        
+                        file->pos += off;
+                        newoff = (file->pos > OFF64_MAX) ? OFF64_MAX : file->pos;
+                        
                         fibril_mutex_unlock(&file->lock);
-                        ipc_answer_1(rid, EOK, off);
+                        ipc_answer_2(rid, EOK, LOWER32(newoff), UPPER32(newoff));
                         return;
-                }
-                break;
-        case SEEK_CUR:
-                if ((off >= 0) && (file->pos + off < file->pos)) {
-                        fibril_mutex_unlock(&file->lock);
-                        ipc_answer_0(rid, EOVERFLOW);
-                        return;
-                }
-                
-                if ((off < 0) && (file->pos < (aoff64_t) -off)) {
-                        fibril_mutex_unlock(&file->lock);
-                        ipc_answer_0(rid, EOVERFLOW);
-                        return;
-                }
-                
-                file->pos += off;
-                newoff = (file->pos > OFF64_MAX) ?  OFF64_MAX : file->pos;
-                
-                fibril_mutex_unlock(&file->lock);
-                ipc_answer_2(rid, EOK, LOWER32(newoff),
-                    UPPER32(newoff));
-                return;
-        case SEEK_END:
-                fibril_rwlock_read_lock(&file->node->contents_rwlock);
-                aoff64_t size = file->node->size;
-                
-                if ((off >= 0) && (size + off < size)) {
+                case SEEK_END:
+                        fibril_rwlock_read_lock(&file->node->contents_rwlock);
+                        aoff64_t size = file->node->size;
+                        
+                        if ((off >= 0) && (size + off < size)) {
+                                fibril_rwlock_read_unlock(&file->node->contents_rwlock);
+                                fibril_mutex_unlock(&file->lock);
+                                ipc_answer_0(rid, EOVERFLOW);
+                                return;
+                        }
+                        
+                        if ((off < 0) && (size < (aoff64_t) -off)) {
+                                fibril_rwlock_read_unlock(&file->node->contents_rwlock);
+                                fibril_mutex_unlock(&file->lock);
+                                ipc_answer_0(rid, EOVERFLOW);
+                                return;
+                        }
+                        
+                        file->pos = size + off;
+                        newoff = (file->pos > OFF64_MAX) ? OFF64_MAX : file->pos;
+                        
                         fibril_rwlock_read_unlock(&file->node->contents_rwlock);
                         fibril_mutex_unlock(&file->lock);
-                        ipc_answer_0(rid, EOVERFLOW);
+                        ipc_answer_2(rid, EOK, LOWER32(newoff), UPPER32(newoff));
                         return;
-                }
-                
-                if ((off < 0) && (size < (aoff64_t) -off)) {
-                        fibril_rwlock_read_unlock(&file->node->contents_rwlock);
-                        fibril_mutex_unlock(&file->lock);
-                        ipc_answer_0(rid, EOVERFLOW);
-                        return;
-                }
-                
-                file->pos = size + off;
-                newoff = (file->pos > OFF64_MAX) ?  OFF64_MAX : file->pos;
-                
-                fibril_rwlock_read_unlock(&file->node->contents_rwlock);
-                fibril_mutex_unlock(&file->lock);
-                ipc_answer_2(rid, EOK, LOWER32(newoff), UPPER32(newoff));
-                return;
         }
         
@@ -981 +977 @@
 {
         int fd = IPC_GET_ARG1(*request);
-        aoff64_t size = (aoff64_t) MERGE_LOUP32(IPC_GET_ARG2(*request),
-            IPC_GET_ARG3(*request));
+        aoff64_t size =
+            (aoff64_t) MERGE_LOUP32(IPC_GET_ARG2(*request), IPC_GET_ARG3(*request));
         int rc;