Changeset 51774cd in mainline for uspace/lib/fs/libfs.c

Timestamp:

2017-04-04T21:31:40Z (8 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

File:

• uspace/lib/fs/libfs.c (modified) (4 diffs)

uspace/lib/fs/libfs.c

@@ -231 +231 @@
 }
 
-static void vfs_out_get_size(ipc_callid_t rid, ipc_call_t *req)
-{
-        service_id_t service_id = (service_id_t) IPC_GET_ARG1(*req);
-        fs_index_t index = (fs_index_t) IPC_GET_ARG2(*req);
-        int rc;
-
-        fs_node_t *node = NULL;
-        rc = libfs_ops->node_get(&node, service_id, index);
-        if (rc != EOK)
-                async_answer_0(rid, rc);
-        if (node == NULL)
-                async_answer_0(rid, EINVAL);
-        
-        uint64_t size = libfs_ops->size_get(node);
-        libfs_ops->node_put(node);
-        
-        async_answer_2(rid, EOK, LOWER32(size), UPPER32(size));
-}
-
 static void vfs_out_is_empty(ipc_callid_t rid, ipc_call_t *req)
 {
@@ -330 +311 @@
                         vfs_out_statfs(callid, &call);
                         break;
-                case VFS_OUT_GET_SIZE:
-                        vfs_out_get_size(callid, &call);
-                        break;
                 case VFS_OUT_IS_EMPTY:
                         vfs_out_is_empty(callid, &call);
@@ -651 +629 @@
                 rc = ops->unlink(par, cur, component);
                 if (rc == EOK) {
-                        int64_t size = ops->size_get(cur);
-                        int32_t lsize = LOWER32(size);
-                        if (lsize != size)
-                                lsize = -1;
-                        
+                        aoff64_t size = ops->size_get(cur);
                         async_answer_5(rid, fs_handle, service_id,
-                            ops->index_get(cur), last, lsize,
-                            ops->is_directory(cur));
+                            ops->index_get(cur),
+                            (ops->is_directory(cur) << 16) | last,
+                            LOWER32(size), UPPER32(size));
                 } else {
                         async_answer_0(rid, rc);
@@ -703 +678 @@
         }
         
-        int64_t size = ops->size_get(cur);
-        int32_t lsize = LOWER32(size);
-        if (lsize != size)
-                lsize = -1;
-        
-        async_answer_5(rid, fs_handle, service_id, ops->index_get(cur), last,
-            lsize, ops->is_directory(cur));
+        aoff64_t size = ops->size_get(cur);
+        async_answer_5(rid, fs_handle, service_id, ops->index_get(cur),
+            (ops->is_directory(cur) << 16) | last, LOWER32(size),
+            UPPER32(size));
         
 out: