Changeset 67e881c in mainline for uspace/srv/vfs

Timestamp:

2017-03-30T20:59:36Z (9 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

a56cef9

Parents:

79ea5af

Message:

Rename ftruncate() to vfs_resize()

Location:

uspace/srv/vfs

Files:

• vfs.h (modified) (1 diff)
• vfs_ipc.c (modified) (4 diffs)
• vfs_ops.c (modified) (2 diffs)

uspace/srv/vfs/vfs.h

@@ -211 +211 @@
 extern int vfs_op_read(int fd, aoff64_t, size_t *out_bytes);
 extern int vfs_op_rename(int basefd, char *old, char *new);
+extern int vfs_op_resize(int fd, int64_t size);
 extern int vfs_op_stat(int fd);
 extern int vfs_op_statfs(int fd);
 extern int vfs_op_sync(int fd);
-extern int vfs_op_truncate(int fd, int64_t size);
 extern int vfs_op_unlink(int parentfd, int expectfd, char *path);
 extern int vfs_op_unmount(int mpfd);

uspace/srv/vfs/vfs_ipc.c

@@ -160 +160 @@
 }
 
+static void vfs_in_resize(ipc_callid_t rid, ipc_call_t *request)
+{
+        int fd = IPC_GET_ARG1(*request);
+        int64_t size = MERGE_LOUP32(IPC_GET_ARG2(*request), IPC_GET_ARG3(*request));
+        int rc = vfs_op_resize(fd, size);
+        async_answer_0(rid, rc);
+}
+
 static void vfs_in_stat(ipc_callid_t rid, ipc_call_t *request)
 {
@@ -179 +187 @@
         int fd = IPC_GET_ARG1(*request);
         int rc = vfs_op_sync(fd);
-        async_answer_0(rid, rc);
-}
-
-static void vfs_in_truncate(ipc_callid_t rid, ipc_call_t *request)
-{
-        int fd = IPC_GET_ARG1(*request);
-        int64_t size = MERGE_LOUP32(IPC_GET_ARG2(*request), IPC_GET_ARG3(*request));
-        int rc = vfs_op_truncate(fd, size);
         async_answer_0(rid, rc);
 }
@@ -287 +287 @@
                         vfs_in_rename(callid, &call);
                         break;
+                case VFS_IN_RESIZE:
+                        vfs_in_resize(callid, &call);
+                        break;
                 case VFS_IN_STAT:
                         vfs_in_stat(callid, &call);
@@ -295 +298 @@
                 case VFS_IN_SYNC:
                         vfs_in_sync(callid, &call);
-                        break;
-                case VFS_IN_TRUNCATE:
-                        vfs_in_truncate(callid, &call);
                         break;
                 case VFS_IN_UNLINK:

uspace/srv/vfs/vfs_ops.c

@@ -585 +585 @@
 }
 
+int vfs_op_resize(int fd, int64_t size)
+{
+        vfs_file_t *file = vfs_file_get(fd);
+        if (!file)
+                return EBADF;
+
+        fibril_rwlock_write_lock(&file->node->contents_rwlock);
+        
+        int rc = vfs_truncate_internal(file->node->fs_handle,
+            file->node->service_id, file->node->index, size);
+        if (rc == EOK)
+                file->node->size = size;
+        
+        fibril_rwlock_write_unlock(&file->node->contents_rwlock);
+        vfs_file_put(file);
+        return rc;
+}
+
 int vfs_op_stat(int fd)
 {
@@ -652 +670 @@
         
         return (int) rc;
-}
-
-int vfs_op_truncate(int fd, int64_t size)
-{
-        vfs_file_t *file = vfs_file_get(fd);
-        if (!file)
-                return EBADF;
-
-        fibril_rwlock_write_lock(&file->node->contents_rwlock);
-        
-        int rc = vfs_truncate_internal(file->node->fs_handle,
-            file->node->service_id, file->node->index, size);
-        if (rc == EOK)
-                file->node->size = size;
-        
-        fibril_rwlock_write_unlock(&file->node->contents_rwlock);
-        vfs_file_put(file);
-        return rc;
 }