Changeset 747a1e71 in mainline for uspace/srv/fs/mfs/mfs_rw.c

Timestamp:

2011-09-27T13:54:53Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

8c9e71a, e231d26

Parents:

ab545980 (diff), 36cb22f (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 from lp:mfs.

File:

• uspace/srv/fs/mfs/mfs_rw.c (modified) (2 diffs)

uspace/srv/fs/mfs/mfs_rw.c

@@ -31 +31 @@
  */
 
+#include <align.h>
 #include "mfs.h"
 
@@ -70 +71 @@
         int rblock = pos / block_size;
 
-        if (mnode->ino_i->i_size < pos) {
+        if (ROUND_UP(mnode->ino_i->i_size, sbi->block_size) < pos) {
                 /*Trying to read beyond the end of file*/
                 r = EOK;