Changeset 51774cd in mainline for uspace/srv/vfs

Timestamp:

2017-04-04T21:31:40Z (9 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

2166728

Parents:

59f388a

Message:

Reintroduce aoff64_t file sizes into VFS

Location:

uspace/srv/vfs

Files:

• vfs.h (modified) (2 diffs)
• vfs_lookup.c (modified) (2 diffs)
• vfs_node.c (modified) (1 diff)
• vfs_ops.c (modified) (1 diff)

uspace/srv/vfs/vfs.h

@@ -113 +113 @@
         vfs_node_type_t type;   /**< Partial info about the node type. */
 
-        int64_t size;           /**< Cached size if the node is a file. */
+        aoff64_t size;          /**< Cached size if the node is a file. */
 
         /**
@@ -185 +185 @@
 extern unsigned vfs_nodes_refcount_sum_get(fs_handle_t, service_id_t);
 
-extern int64_t vfs_node_get_size(vfs_node_t *node);
 extern bool vfs_node_has_children(vfs_node_t *node);
 

uspace/srv/vfs/vfs_lookup.c

@@ -226 +226 @@
         
         unsigned last = *pfirst + *plen;
-        *pfirst = IPC_GET_ARG3(answer);
+        *pfirst = IPC_GET_ARG3(answer) & 0xffff;
         *plen = last - *pfirst;
         
@@ -232 +232 @@
         result->triplet.service_id = (service_id_t) IPC_GET_ARG1(answer);
         result->triplet.index = (fs_index_t) IPC_GET_ARG2(answer);
-        result->size = (int64_t)(int32_t) IPC_GET_ARG4(answer);
-        result->type = IPC_GET_ARG5(answer) ?
+        result->size = MERGE_LOUP32(IPC_GET_ARG4(answer), IPC_GET_ARG5(answer));
+        result->type = (IPC_GET_ARG3(answer) >> 16) ?
             VFS_NODE_DIRECTORY : VFS_NODE_FILE;
         return EOK;

uspace/srv/vfs/vfs_node.c

@@ -315 +315 @@
 }
 
-int64_t vfs_node_get_size(vfs_node_t *node)
-{
-        if (node->size == -1) {
-                sysarg_t sz1 = 0;
-                sysarg_t sz2 = 0;
-                
-                async_exch_t *exch = vfs_exchange_grab(node->fs_handle);
-                (void) async_req_2_2(exch, VFS_OUT_GET_SIZE, node->service_id,
-                    node->index, &sz1, &sz2);
-                vfs_exchange_release(exch);
-                
-                node->size = MERGE_LOUP32(sz1, sz2);
-        }
-        return node->size;
-}
-
 bool vfs_node_has_children(vfs_node_t *node)
 {

uspace/srv/vfs/vfs_ops.c

@@ -439 +439 @@
         async_exch_t *fs_exch = vfs_exchange_grab(file->node->fs_handle);
         
-        if (!read && file->append) {
-                if (file->node->size == -1)
-                        file->node->size = vfs_node_get_size(file->node);
+        if (!read && file->append)
                 pos = file->node->size;
-        }
         
         /*