Changeset b0247bac in mainline

Timestamp:

2008-10-27T22:38:56Z (16 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

5cf723b

Parents:

0951495

Message:

Directory size is always a multiple of BPS. Fix computation of number of
directory entries in the last block of the directory.

File:

• uspace/srv/fs/fat/fat_ops.c (modified) (3 diffs)

uspace/srv/fs/fat/fat_ops.c

@@ -267 +267 @@
         bps = uint16_t_le2host(FAT_BS(bb)->bps);
         dps = bps / sizeof(fat_dentry_t);
-        blocks = parentp->size / bps + (parentp->size % bps != 0);
+        blocks = parentp->size / bps;
         for (i = 0; i < blocks; i++) {
-                unsigned dentries;
-                
                 b = fat_block_get(bb->data, parentp, i);
-                dentries = (i == blocks - 1) ?
-                    parentp->size % sizeof(fat_dentry_t) :
-                    dps;
-                for (j = 0; j < dentries; j++) { 
+                for (j = 0; j < dps; j++) { 
                         d = ((fat_dentry_t *)b->data) + j;
                         switch (fat_classify_dentry(d)) {
@@ -356 +351 @@
         if (nodep->type != FAT_DIRECTORY)
                 return false;
-
+        
         futex_down(&nodep->idx->lock);
         bb = block_get(nodep->idx->dev_handle, BS_BLOCK, BS_SIZE);
@@ -362 +357 @@
         dps = bps / sizeof(fat_dentry_t);
 
-        blocks = nodep->size / bps + (nodep->size % bps != 0);
+        blocks = nodep->size / bps;
 
         for (i = 0; i < blocks; i++) {
-                unsigned dentries;
                 fat_dentry_t *d;
         
                 b = fat_block_get(bb->data, nodep, i);
-                dentries = (i == blocks - 1) ?
-                    nodep->size % sizeof(fat_dentry_t) :
-                    dps;
-                for (j = 0; j < dentries; j++) {
+                for (j = 0; j < dps; j++) {
                         d = ((fat_dentry_t *)b->data) + j;
                         switch (fat_classify_dentry(d)) {