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

Timestamp:

2013-10-05T11:53:43Z (12 years ago)

Author:

Martin Sucha <sucha14@…>

Branches:

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

Children:

cbfc8b7

Parents:

408424e (diff), 3e896e1 (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

@@ -342 +342 @@
 }
 
-ssize_t read(int fildes, void *buf, size_t nbyte) 
+ssize_t read(int fildes, void *buf, size_t nbyte)
 {
         sysarg_t rc;
@@ -348 +348 @@
         aid_t req;
         
+        if (nbyte > DATA_XFER_LIMIT)
+                nbyte = DATA_XFER_LIMIT;
+        
         async_exch_t *exch = vfs_exchange_begin();
         
         req = async_send_1(exch, VFS_IN_READ, fildes, &answer);
-        rc = async_data_read_start(exch, (void *)buf, nbyte);
+        rc = async_data_read_start(exch, (void *) buf, nbyte);
         if (rc != EOK) {
                 vfs_exchange_end(exch);
@@ -377 +380 @@
         aid_t req;
         
+        if (nbyte > DATA_XFER_LIMIT)
+                nbyte = DATA_XFER_LIMIT;
+        
         async_exch_t *exch = vfs_exchange_begin();
         
         req = async_send_1(exch, VFS_IN_WRITE, fildes, &answer);
-        rc = async_data_write_start(exch, (void *)buf, nbyte);
+        rc = async_data_write_start(exch, (void *) buf, nbyte);
         if (rc != EOK) {
                 vfs_exchange_end(exch);