Changeset 67e881c in mainline

Timestamp:

2017-03-30T20:59:36Z (8 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

Files:

• app/trace/trace.c (modified) (1 diff)
• lib/c/generic/vfs/vfs.c (modified) (2 diffs)
• lib/c/include/ipc/vfs.h (modified) (1 diff)
• lib/c/include/unistd.h (modified) (1 diff)
• lib/c/include/vfs/vfs.h (modified) (1 diff)
• lib/posix/source/unistd.c (modified) (1 diff)
• srv/vfs/vfs.h (modified) (1 diff)
• srv/vfs/vfs_ipc.c (modified) (4 diffs)
• srv/vfs/vfs_ops.c (modified) (2 diffs)

uspace/app/trace/trace.c

@@ -706 +706 @@
         proto_add_oper(p, VFS_IN_WRITE, o);
         o = oper_new("truncate", 5, arg_def, V_ERRNO, 0, resp_def);
-        proto_add_oper(p, VFS_IN_TRUNCATE, o);
+        proto_add_oper(p, VFS_IN_RESIZE, o);
         o = oper_new("fstat", 1, arg_def, V_ERRNO, 0, resp_def);
         proto_add_oper(p, VFS_IN_STAT, o);

uspace/lib/c/generic/vfs/vfs.c

@@ -408 +408 @@
                 assert(!(oflag & O_APPEND));
                 
-                (void) ftruncate(fd, 0);
+                (void) vfs_resize(fd, 0);
         }
 
@@ -620 +620 @@
  * @param length Length
  *
- * @return 0 on success, -1 on error and sets errno.
- */
-int ftruncate(int fildes, aoff64_t length)
+ * @return 0 on success or a negative erroc code otherwise.
+ */
+int vfs_resize(int file, aoff64_t length)
 {
         sysarg_t rc;
         
         async_exch_t *exch = vfs_exchange_begin();
-        rc = async_req_3_0(exch, VFS_IN_TRUNCATE, fildes,
-            LOWER32(length), UPPER32(length));
-        vfs_exchange_end(exch);
-        
-        if (rc != EOK) {
-                errno = rc;
-                return -1;
-        }
-        
-        return 0;
+        rc = async_req_3_0(exch, VFS_IN_RESIZE, file, LOWER32(length),
+            UPPER32(length));
+        vfs_exchange_end(exch);
+        
+        return rc;
 }
 

uspace/lib/c/include/ipc/vfs.h

@@ -65 +65 @@
         VFS_IN_READ = IPC_FIRST_USER_METHOD,
         VFS_IN_WRITE,
-        VFS_IN_TRUNCATE,
+        VFS_IN_RESIZE,
         VFS_IN_STAT,
         VFS_IN_CLOSE,

uspace/lib/c/include/unistd.h

@@ -61 +61 @@
 extern ssize_t read(int, aoff64_t *, void *, size_t);
 
-extern int ftruncate(int, aoff64_t);
-
 extern int close(int);
 extern int fsync(int);

uspace/lib/c/include/vfs/vfs.h

@@ -90 +90 @@
 extern int vfs_root(void);
 extern void vfs_root_set(int);
+extern int vfs_resize(int, aoff64_t);
 extern int vfs_stat(int, struct stat *);
 extern int vfs_stat_path(const char *, struct stat *);

uspace/lib/posix/source/unistd.c

@@ -259 +259 @@
 int posix_ftruncate(int fildes, posix_off_t length)
 {
-        return negerrno(ftruncate, fildes, (aoff64_t) length);
+        if (rcerrno(vfs_resize, fildes, (aoff64_t) length) != EOK)
+                return -1;
+        else
+                return 0;
 }
 

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;
 }