Changeset 979c313a in mainline

Timestamp:

2011-05-02T07:35:20Z (13 years ago)

Author:

Oleg Romanenko <romanenko.oleg@…>

Branches:

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

Children:

a8c14aa

Parents:

b5db2ae

Message:

Fix bug with cluster at sector boundary (FAT12 only).

File:

• uspace/srv/fs/fat/fat_fat.c (modified) (6 diffs)

uspace/srv/fs/fat/fat_fat.c

@@ -57 +57 @@
         (SSA((bs)) + ((cl) - FAT_CLST_FIRST) * SPC((bs)) + (bn) % SPC((bs)))
 
+#define IS_ODD(number)  (number & 0x1)
+
 /**
  * The fat_alloc_lock mutex protects all copies of the File Allocation Table
@@ -302 +304 @@
         assert(fatno < FATCNT(bs));
         
-        *value = 0;
-
         if (FAT_IS_FAT12(bs))
                 offset = (clst + clst/2);
@@ -314 +314 @@
                 return rc;
 
-        /* This cluster access spans a sector boundary. Check only for FAT12 */
         if (FAT_IS_FAT12(bs)) {
+                /* This cluster access spans a sector boundary. Check only for FAT12 */
                 if ((offset % BPS(bs) + 1 == BPS(bs))) {
                         /* Is it last sector of FAT? */
@@ -331 +331 @@
                                 */
                                 *value  = *(uint8_t *)(b->data + BPS(bs) - 1);
-                                *value |= *(uint8_t *)(b1->data);
+                                *value |= *(uint8_t *)(b1->data) << 8;
 
                                 rc = block_put(b1);
@@ -345 +345 @@
                         }
                 }
-
-                if (clst & 0x0001)
+                else
+                        *value = *(uint16_t *)(b->data + offset % BPS(bs));
+
+                if (IS_ODD(clst))
                         *value = (*value) >> 4;
                 else
@@ -358 +360 @@
         }
 
-        *value = uint16_t_le2host(*value);
+        *value = uint32_t_le2host(*value);
         rc = block_put(b);