Changeset 482dde7 in mainline

Timestamp:

2010-08-03T11:03:59Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

1d3d2cf, a1e98de

Parents:

9a1d8ab (diff), 4637c72 (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:~jakub/helenos/fs.

File:

• uspace/srv/fs/fat/fat_fat.c (modified) (1 diff)

uspace/srv/fs/fat/fat_fat.c

@@ -424 +424 @@
                 for (c = 0; c < BPS(bs) / sizeof(fat_cluster_t); c++, cl++) {
                         /*
-                         * Check if the cluster is physically there. This check
-                         * becomes necessary when the file system is created
-                         * with fewer total sectors than how many is inferred
-                         * from the size of the file allocation table.
+                         * Check if the entire cluster is physically there.
+                         * This check becomes necessary when the file system is
+                         * created with fewer total sectors than how many is
+                         * inferred from the size of the file allocation table
+                         * or when the last cluster ends beyond the end of the
+                         * device.
                          */
-                        if ((cl >= 2) &&
-                            ((cl - 2) * SPC(bs) + SSA(bs) >= TS(bs))) {
+                        if ((cl >= FAT_CLST_FIRST) &&
+                            CLBN2PBN(bs, cl, SPC(bs) - 1) >= TS(bs)) {
                                 rc = block_put(blk);
                                 if (rc != EOK)