Changeset a56cef9 in mainline

Timestamp:

2017-03-30T21:09:51Z (8 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

6e5562a

Parents:

67e881c

Message:

Rename fsync() to vfs_sync()

Location:

uspace

Files:

• app/kio/kio.c (modified) (2 diffs)
• lib/c/generic/io/io.c (modified) (2 diffs)
• lib/c/generic/vfs/vfs.c (modified) (2 diffs)
• 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)

uspace/app/kio/kio.c

@@ -48 +48 @@
 #include <adt/prodcons.h>
 #include <tinput.h>
+#include <vfs/vfs.h>
 
 #define NAME       "kio"
@@ -128 +129 @@
                         
                         fflush(log);
-                        fsync(fileno(log));
+                        vfs_sync(fileno(log));
                 }
                 

uspace/lib/c/generic/io/io.c

@@ -836 +836 @@
         
         if ((stream->fd >= 0) && (stream->need_sync)) {
+                int rc;
+
                 /**
                  * Better than syncing always, but probably still not the
@@ -841 +843 @@
                  */
                 stream->need_sync = false;
-                if (fsync(stream->fd) != 0) {
-                        /* errno was set by fsync() */
+                rc = vfs_sync(stream->fd);
+                if (rc != EOK) {
+                        errno = rc;
                         return EOF;
                 }

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

@@ -597 +597 @@
  *
  * @param fildes File descriptor
- * @return 0 on success. On error returns -1 and sets errno.
- */
-int fsync(int fildes)
-{
-        async_exch_t *exch = vfs_exchange_begin();
-        sysarg_t rc = async_req_1_0(exch, VFS_IN_SYNC, fildes);
-        vfs_exchange_end(exch);
-        
-        if (rc != EOK) {
-                errno = rc;
-                return -1;
-        }
-        
-        return 0;
+ * @return EOK on success or a negative error code otherwise.
+ */
+int vfs_sync(int file)
+{
+        async_exch_t *exch = vfs_exchange_begin();
+        sysarg_t rc = async_req_1_0(exch, VFS_IN_SYNC, file);
+        vfs_exchange_end(exch);
+        
+        return rc;
 }
 
@@ -620 +615 @@
  * @param length Length
  *
- * @return 0 on success or a negative erroc code otherwise.
+ * @return EOK on success or a negative erroc code otherwise.
  */
 int vfs_resize(int file, aoff64_t length)

uspace/lib/c/include/unistd.h

@@ -62 +62 @@
 
 extern int close(int);
-extern int fsync(int);
 
 extern char *getcwd(char *, size_t);

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

@@ -95 +95 @@
 extern int vfs_statfs(int, struct statfs *);
 extern int vfs_statfs_path(const char *, struct statfs *);
+extern int vfs_sync(int);
 extern int vfs_unlink(int, const char *, int);
 extern int vfs_unlink_path(const char *);

uspace/lib/posix/source/unistd.c

@@ -247 +247 @@
 int posix_fsync(int fildes)
 {
-        return negerrno(fsync, fildes);
+        if (rcerrno(vfs_sync, fildes) != EOK)
+                return -1;
+        else
+                return 0;
 }