Changeset b910455 in mainline for uspace/lib/c/generic/vfs/vfs.c

Timestamp:

2011-04-07T09:46:11Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

6639ae1

Parents:

f6bffee (diff), 8e80d3f (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

File:

• uspace/lib/c/generic/vfs/vfs.c (modified) (3 diffs)

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

@@ -378 +378 @@
         
         req = async_send_1(vfs_phone, VFS_IN_READ, fildes, &answer);
-        rc = async_data_read_start_flexible(vfs_phone, (void *) buf, nbyte,
+        rc = async_data_read_start_generic(vfs_phone, (void *) buf, nbyte,
             IPC_XF_RESTRICT);
         if (rc != EOK) {
@@ -408 +408 @@
         
         req = async_send_1(vfs_phone, VFS_IN_WRITE, fildes, &answer);
-        rc = async_data_write_start_flexible(vfs_phone, (void *) buf, nbyte,
+        rc = async_data_write_start_generic(vfs_phone, (void *) buf, nbyte,
             IPC_XF_RESTRICT);
         if (rc != EOK) {
@@ -758 +758 @@
 {
         struct stat stat;
-        int rc;
-
-        rc = fstat(fildes, &stat);
-
+        
+        int rc = fstat(fildes, &stat);
+        if (rc != 0)
+                return rc;
+        
         if (!stat.device)
                 return -1;