Changeset d45660a in mainline for uspace/srv/fs/fat/fat_ops.c

Timestamp:

2010-01-15T20:34:05Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

dc9162b

Parents:

5edb1f5 (diff), 92bee46 (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 FAT server fix.

File:

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

uspace/srv/fs/fat/fat_ops.c

@@ -324 +324 @@
         /* Check number of sectors per FAT. */
         if (bs->sec_per_fat == 0)
+                return ENOTSUP;
+
+        /*
+         * Check that the root directory entries take up whole blocks.
+         * This check is rather strict, but it allows us to treat the root
+         * directory and non-root directories uniformly in some places.
+         * It can be removed provided that functions such as fat_read() are
+         * sanitized to support file systems with this property.
+         */
+        if ((uint16_t_le2host(bs->root_ent_max) * sizeof(fat_dentry_t)) %
+            uint16_t_le2host(bs->bps) != 0)
                 return ENOTSUP;