Changes in / [9a1d8ab:14f2100] in mainline

Location:

uspace/srv/fs/fat

Files:

• fat.h (modified) (2 diffs)
• fat_fat.c (modified) (20 diffs)
• fat_fat.h (modified) (1 diff)
• fat_ops.c (modified) (49 diffs)

uspace/srv/fs/fat/fat.h

@@ -48 +48 @@
 
 #define min(a, b)               ((a) < (b) ? (a) : (b))
-
-/*
- * Convenience macros for accessing some frequently used boot sector members.
- */
-#define BPS(bs)         uint16_t_le2host((bs)->bps)
-#define SPC(bs)         (bs)->spc
-#define RSCNT(bs)       uint16_t_le2host((bs)->rscnt)
-#define FATCNT(bs)      (bs)->fatcnt
-#define SF(bs)          uint16_t_le2host((bs)->sec_per_fat)
-#define RDE(bs)         uint16_t_le2host((bs)->root_ent_max)
-#define TS(bs)          (uint16_t_le2host((bs)->totsec16) != 0 ? \
-                        uint16_t_le2host((bs)->totsec16) : \
-                        uint32_t_le2host(bs->totsec32))
 
 #define BS_BLOCK                0
@@ -211 +198 @@
         unsigned                refcnt;
         bool                    dirty;
-
-        /*
-         * Cache of the node's last and "current" cluster to avoid some
-         * unnecessary FAT walks.
-         */
-        /* Node's last cluster in FAT. */
-        bool            lastc_cached_valid;
-        fat_cluster_t   lastc_cached_value;
-        /* Node's "current" cluster, i.e. where the last I/O took place. */
-        bool            currc_cached_valid;
-        aoff64_t        currc_cached_bn;
-        fat_cluster_t   currc_cached_value;
 } fat_node_t;
 

uspace/srv/fs/fat/fat_fat.c

@@ -49 +49 @@
 #include <mem.h>
 
-/*
- * Convenience macros for computing some frequently used values from the
- * primitive boot sector members.
- */
-#define RDS(bs)         ((sizeof(fat_dentry_t) * RDE((bs))) / BPS((bs))) + \
-                        (((sizeof(fat_dentry_t) * RDE((bs))) % BPS((bs))) != 0)
-#define SSA(bs)         (RSCNT((bs)) + FATCNT((bs)) * SF((bs)) + RDS(bs))
-
-#define CLBN2PBN(bs, cl, bn) \
-        (SSA((bs)) + ((cl) - FAT_CLST_FIRST) * SPC((bs)) + (bn) % SPC((bs)))
-
 /**
  * The fat_alloc_lock mutex protects all copies of the File Allocation Table
@@ -85 +74 @@
 {
         block_t *b;
+        unsigned bps;
+        unsigned rscnt;         /* block address of the first FAT */
         uint16_t clusters = 0;
         fat_cluster_t clst = firstc;
         int rc;
+
+        bps = uint16_t_le2host(bs->bps);
+        rscnt = uint16_t_le2host(bs->rscnt);
 
         if (firstc == FAT_CLST_RES0) {
@@ -105 +99 @@
                 if (lastc)
                         *lastc = clst;  /* remember the last cluster number */
-                fsec = (clst * sizeof(fat_cluster_t)) / BPS(bs);
-                fidx = clst % (BPS(bs) / sizeof(fat_cluster_t));
+                fsec = (clst * sizeof(fat_cluster_t)) / bps;
+                fidx = clst % (bps / sizeof(fat_cluster_t));
                 /* read FAT1 */
-                rc = block_get(&b, dev_handle, RSCNT(bs) + fsec,
-                    BLOCK_FLAGS_NONE);
+                rc = block_get(&b, dev_handle, rscnt + fsec, BLOCK_FLAGS_NONE);
                 if (rc != EOK)
                         return rc;
@@ -132 +125 @@
  * @param block         Pointer to a block pointer for storing result.
  * @param bs            Buffer holding the boot sector of the file system.
- * @param nodep         FAT node.
+ * @param dev_handle    Device handle of the file system.
+ * @param firstc        First cluster used by the file. Can be zero if the file
+ *                      is empty.
  * @param bn            Block number.
  * @param flags         Flags passed to libblock.
@@ -139 +134 @@
  */
 int
-fat_block_get(block_t **block, struct fat_bs *bs, fat_node_t *nodep,
-    aoff64_t bn, int flags)
-{
-        fat_cluster_t firstc = nodep->firstc;
-        fat_cluster_t currc;
-        aoff64_t relbn = bn;
-        int rc;
-
-        if (!nodep->size)
-                return ELIMIT;
-
-        if (nodep->firstc == FAT_CLST_ROOT) 
-                goto fall_through;
-
-        if (((((nodep->size - 1) / BPS(bs)) / SPC(bs)) == bn / SPC(bs)) &&
-            nodep->lastc_cached_valid) {
-                /*
-                 * This is a request to read a block within the last cluster
-                 * when fortunately we have the last cluster number cached.
-                 */
-                return block_get(block, nodep->idx->dev_handle,
-                    CLBN2PBN(bs, nodep->lastc_cached_value, bn), flags);
-        }
-
-        if (nodep->currc_cached_valid && bn >= nodep->currc_cached_bn) {
-                /*
-                 * We can start with the cluster cached by the previous call to
-                 * fat_block_get().
-                 */
-                firstc = nodep->currc_cached_value;
-                relbn -= (nodep->currc_cached_bn / SPC(bs)) * SPC(bs);
-        }
-
-fall_through:
-        rc = _fat_block_get(block, bs, nodep->idx->dev_handle, firstc,
-            &currc, relbn, flags);
-        if (rc != EOK)
-                return rc;
-        
-        /*
-         * Update the "current" cluster cache.
-         */
-        nodep->currc_cached_valid = true;
-        nodep->currc_cached_bn = bn;
-        nodep->currc_cached_value = currc;
-
-        return rc;
-}
-
-/** Read block from file located on a FAT file system.
- *
- * @param block         Pointer to a block pointer for storing result.
- * @param bs            Buffer holding the boot sector of the file system.
- * @param dev_handle    Device handle of the file system.
- * @param fcl           First cluster used by the file. Can be zero if the file
- *                      is empty.
- * @param clp           If not NULL, address where the cluster containing bn
- *                      will be stored.
- *                      stored 
- * @param bn            Block number.
- * @param flags         Flags passed to libblock.
- *
- * @return              EOK on success or a negative error code.
- */
-int
 _fat_block_get(block_t **block, fat_bs_t *bs, dev_handle_t dev_handle,
-    fat_cluster_t fcl, fat_cluster_t *clp, aoff64_t bn, int flags)
-{
+    fat_cluster_t firstc, aoff64_t bn, int flags)
+{
+        unsigned bps;
+        unsigned rscnt;         /* block address of the first FAT */
+        unsigned rde;
+        unsigned rds;           /* root directory size */
+        unsigned sf;
+        unsigned ssa;           /* size of the system area */
         uint16_t clusters;
         unsigned max_clusters;
-        fat_cluster_t c;
+        fat_cluster_t lastc;
         int rc;
 
@@ -215 +151 @@
          * This function can only operate on non-zero length files.
          */
-        if (fcl == FAT_CLST_RES0)
+        if (firstc == FAT_CLST_RES0)
                 return ELIMIT;
 
-        if (fcl == FAT_CLST_ROOT) {
+        bps = uint16_t_le2host(bs->bps);
+        rscnt = uint16_t_le2host(bs->rscnt);
+        rde = uint16_t_le2host(bs->root_ent_max);
+        sf = uint16_t_le2host(bs->sec_per_fat);
+
+        rds = (sizeof(fat_dentry_t) * rde) / bps;
+        rds += ((sizeof(fat_dentry_t) * rde) % bps != 0);
+        ssa = rscnt + bs->fatcnt * sf + rds;
+
+        if (firstc == FAT_CLST_ROOT) {
                 /* root directory special case */
-                assert(bn < RDS(bs));
-                rc = block_get(block, dev_handle,
-                    RSCNT(bs) + FATCNT(bs) * SF(bs) + bn, flags);
+                assert(bn < rds);
+                rc = block_get(block, dev_handle, rscnt + bs->fatcnt * sf + bn,
+                    flags);
                 return rc;
         }
 
-        max_clusters = bn / SPC(bs);
-        rc = fat_cluster_walk(bs, dev_handle, fcl, &c, &clusters, max_clusters);
+        max_clusters = bn / bs->spc;
+        rc = fat_cluster_walk(bs, dev_handle, firstc, &lastc, &clusters,
+            max_clusters);
         if (rc != EOK)
                 return rc;
         assert(clusters == max_clusters);
 
-        rc = block_get(block, dev_handle, CLBN2PBN(bs, c, bn), flags);
-
-        if (clp)
-                *clp = c;
+        rc = block_get(block, dev_handle,
+            ssa + (lastc - FAT_CLST_FIRST) * bs->spc + bn % bs->spc, flags);
 
         return rc;
@@ -254 +198 @@
 int fat_fill_gap(fat_bs_t *bs, fat_node_t *nodep, fat_cluster_t mcl, aoff64_t pos)
 {
+        uint16_t bps;
+        unsigned spc;
         block_t *b;
         aoff64_t o, boundary;
         int rc;
 
-        boundary = ROUND_UP(nodep->size, BPS(bs) * SPC(bs));
+        bps = uint16_t_le2host(bs->bps);
+        spc = bs->spc;
+        
+        boundary = ROUND_UP(nodep->size, bps * spc);
 
         /* zero out already allocated space */
         for (o = nodep->size; o < pos && o < boundary;
-            o = ALIGN_DOWN(o + BPS(bs), BPS(bs))) {
-                int flags = (o % BPS(bs) == 0) ?
+            o = ALIGN_DOWN(o + bps, bps)) {
+                int flags = (o % bps == 0) ?
                     BLOCK_FLAGS_NOREAD : BLOCK_FLAGS_NONE;
-                rc = fat_block_get(&b, bs, nodep, o / BPS(bs), flags);
-                if (rc != EOK)
-                        return rc;
-                memset(b->data + o % BPS(bs), 0, BPS(bs) - o % BPS(bs));
+                rc = fat_block_get(&b, bs, nodep, o / bps, flags);
+                if (rc != EOK)
+                        return rc;
+                memset(b->data + o % bps, 0, bps - o % bps);
                 b->dirty = true;                /* need to sync node */
                 rc = block_put(b);
@@ -279 +228 @@
         
         /* zero out the initial part of the new cluster chain */
-        for (o = boundary; o < pos; o += BPS(bs)) {
+        for (o = boundary; o < pos; o += bps) {
                 rc = _fat_block_get(&b, bs, nodep->idx->dev_handle, mcl,
-                    NULL, (o - boundary) / BPS(bs), BLOCK_FLAGS_NOREAD);
-                if (rc != EOK)
-                        return rc;
-                memset(b->data, 0, min(BPS(bs), pos - o));
+                    (o - boundary) / bps, BLOCK_FLAGS_NOREAD);
+                if (rc != EOK)
+                        return rc;
+                memset(b->data, 0, min(bps, pos - o));
                 b->dirty = true;                /* need to sync node */
                 rc = block_put(b);
@@ -308 +257 @@
 {
         block_t *b;
+        uint16_t bps;
+        uint16_t rscnt;
+        uint16_t sf;
         fat_cluster_t *cp;
         int rc;
 
-        rc = block_get(&b, dev_handle, RSCNT(bs) + SF(bs) * fatno +
-            (clst * sizeof(fat_cluster_t)) / BPS(bs), BLOCK_FLAGS_NONE);
+        bps = uint16_t_le2host(bs->bps);
+        rscnt = uint16_t_le2host(bs->rscnt);
+        sf = uint16_t_le2host(bs->sec_per_fat);
+
+        rc = block_get(&b, dev_handle, rscnt + sf * fatno +
+            (clst * sizeof(fat_cluster_t)) / bps, BLOCK_FLAGS_NONE);
         if (rc != EOK)
                 return rc;
-        cp = (fat_cluster_t *)b->data +
-            clst % (BPS(bs) / sizeof(fat_cluster_t));
+        cp = (fat_cluster_t *)b->data + clst % (bps / sizeof(fat_cluster_t));
         *value = uint16_t_le2host(*cp);
         rc = block_put(b);
@@ -338 +293 @@
 {
         block_t *b;
+        uint16_t bps;
+        uint16_t rscnt;
+        uint16_t sf;
         fat_cluster_t *cp;
         int rc;
 
-        assert(fatno < FATCNT(bs));
-        rc = block_get(&b, dev_handle, RSCNT(bs) + SF(bs) * fatno +
-            (clst * sizeof(fat_cluster_t)) / BPS(bs), BLOCK_FLAGS_NONE);
+        bps = uint16_t_le2host(bs->bps);
+        rscnt = uint16_t_le2host(bs->rscnt);
+        sf = uint16_t_le2host(bs->sec_per_fat);
+
+        assert(fatno < bs->fatcnt);
+        rc = block_get(&b, dev_handle, rscnt + sf * fatno +
+            (clst * sizeof(fat_cluster_t)) / bps, BLOCK_FLAGS_NONE);
         if (rc != EOK)
                 return rc;
-        cp = (fat_cluster_t *)b->data +
-            clst % (BPS(bs) / sizeof(fat_cluster_t));
+        cp = (fat_cluster_t *)b->data + clst % (bps / sizeof(fat_cluster_t));
         *cp = host2uint16_t_le(value);
         b->dirty = true;                /* need to sync block */
@@ -403 +364 @@
     fat_cluster_t *mcl, fat_cluster_t *lcl)
 {
+        uint16_t bps;
+        uint16_t rscnt;
+        uint16_t sf;
+        uint32_t ts;
+        unsigned rde;
+        unsigned rds;
+        unsigned ssa;
         block_t *blk;
         fat_cluster_t *lifo;    /* stack for storing free cluster numbers */ 
@@ -413 +381 @@
                 return ENOMEM;
         
+        bps = uint16_t_le2host(bs->bps);
+        rscnt = uint16_t_le2host(bs->rscnt);
+        sf = uint16_t_le2host(bs->sec_per_fat);
+        rde = uint16_t_le2host(bs->root_ent_max);
+        ts = (uint32_t) uint16_t_le2host(bs->totsec16);
+        if (ts == 0)
+                ts = uint32_t_le2host(bs->totsec32);
+
+        rds = (sizeof(fat_dentry_t) * rde) / bps;
+        rds += ((sizeof(fat_dentry_t) * rde) % bps != 0);
+        ssa = rscnt + bs->fatcnt * sf + rds;
+        
         /*
          * Search FAT1 for unused clusters.
          */
         fibril_mutex_lock(&fat_alloc_lock);
-        for (b = 0, cl = 0; b < SF(bs); b++) {
-                rc = block_get(&blk, dev_handle, RSCNT(bs) + b,
-                    BLOCK_FLAGS_NONE);
+        for (b = 0, cl = 0; b < sf; b++) {
+                rc = block_get(&blk, dev_handle, rscnt + b, BLOCK_FLAGS_NONE);
                 if (rc != EOK)
                         goto error;
-                for (c = 0; c < BPS(bs) / sizeof(fat_cluster_t); c++, cl++) {
+                for (c = 0; c < bps / sizeof(fat_cluster_t); c++, cl++) {
                         /*
                          * Check if the cluster is physically there. This check
@@ -429 +408 @@
                          * from the size of the file allocation table.
                          */
-                        if ((cl >= 2) &&
-                            ((cl - 2) * SPC(bs) + SSA(bs) >= TS(bs))) {
+                        if ((cl >= 2) && ((cl - 2) * bs->spc + ssa >= ts)) {
                                 rc = block_put(blk);
                                 if (rc != EOK)
@@ -533 +511 @@
  * @param nodep         Node representing the file.
  * @param mcl           First cluster of the cluster chain to append.
- * @param lcl           Last cluster of the cluster chain to append.
  *
  * @return              EOK on success or a negative error code.
  */
-int
-fat_append_clusters(fat_bs_t *bs, fat_node_t *nodep, fat_cluster_t mcl,
-    fat_cluster_t lcl)
+int fat_append_clusters(fat_bs_t *bs, fat_node_t *nodep, fat_cluster_t mcl)
 {
         dev_handle_t dev_handle = nodep->idx->dev_handle;
-        fat_cluster_t lastc;
+        fat_cluster_t lcl;
         uint16_t numc;
         uint8_t fatno;
         int rc;
 
-        if (nodep->lastc_cached_valid) {
-                lastc = nodep->lastc_cached_value;
-                nodep->lastc_cached_valid = false;
-        } else {
-                rc = fat_cluster_walk(bs, dev_handle, nodep->firstc, &lastc,
-                    &numc, (uint16_t) -1);
-                if (rc != EOK)
-                        return rc;
-
-                if (numc == 0) {
-                        /* No clusters allocated to the node yet. */
-                        nodep->firstc = mcl;
-                        nodep->dirty = true;    /* need to sync node */
-                        return EOK;
-                }
+        rc = fat_cluster_walk(bs, dev_handle, nodep->firstc, &lcl, &numc,
+            (uint16_t) -1);
+        if (rc != EOK)
+                return rc;
+
+        if (numc == 0) {
+                /* No clusters allocated to the node yet. */
+                nodep->firstc = mcl;
+                nodep->dirty = true;            /* need to sync node */
+                return EOK;
         }
 
         for (fatno = FAT1; fatno < bs->fatcnt; fatno++) {
-                rc = fat_set_cluster(bs, nodep->idx->dev_handle, fatno, lastc,
+                rc = fat_set_cluster(bs, nodep->idx->dev_handle, fatno, lcl,
                     mcl);
                 if (rc != EOK)
                         return rc;
         }
-
-        nodep->lastc_cached_valid = true;
-        nodep->lastc_cached_value = lcl;
 
         return EOK;
@@ -581 +548 @@
  * @param bs            Buffer holding the boot sector of the file system.
  * @param nodep         FAT node where the chopping will take place.
- * @param lcl           Last cluster which will remain in the node. If this
+ * @param lastc         Last cluster which will remain in the node. If this
  *                      argument is FAT_CLST_RES0, then all clusters will
  *                      be chopped off.
@@ -587 +554 @@
  * @return              EOK on success or a negative return code.
  */
-int fat_chop_clusters(fat_bs_t *bs, fat_node_t *nodep, fat_cluster_t lcl)
-{
-        int rc;
+int fat_chop_clusters(fat_bs_t *bs, fat_node_t *nodep, fat_cluster_t lastc)
+{
+        int rc;
+
         dev_handle_t dev_handle = nodep->idx->dev_handle;
-
-        /*
-         * Invalidate cached cluster numbers.
-         */
-        nodep->lastc_cached_valid = false;
-        if (nodep->currc_cached_value != lcl)
-                nodep->currc_cached_valid = false;
-
-        if (lcl == FAT_CLST_RES0) {
+        if (lastc == FAT_CLST_RES0) {
                 /* The node will have zero size and no clusters allocated. */
                 rc = fat_free_clusters(bs, dev_handle, nodep->firstc);
@@ -610 +570 @@
                 unsigned fatno;
 
-                rc = fat_get_cluster(bs, dev_handle, FAT1, lcl, &nextc);
+                rc = fat_get_cluster(bs, dev_handle, FAT1, lastc, &nextc);
                 if (rc != EOK)
                         return rc;
@@ -616 +576 @@
                 /* Terminate the cluster chain in all copies of FAT. */
                 for (fatno = FAT1; fatno < bs->fatcnt; fatno++) {
-                        rc = fat_set_cluster(bs, dev_handle, fatno, lcl,
+                        rc = fat_set_cluster(bs, dev_handle, fatno, lastc,
                             FAT_CLST_LAST1);
                         if (rc != EOK)
@@ -628 +588 @@
         }
 
-        /*
-         * Update and re-enable the last cluster cache.
-         */
-        nodep->lastc_cached_valid = true;
-        nodep->lastc_cached_value = lcl;
-
         return EOK;
 }
@@ -642 +596 @@
         int i;
         block_t *b;
-        int rc;
-
-        for (i = 0; i < SPC(bs); i++) {
-                rc = _fat_block_get(&b, bs, dev_handle, c, NULL, i,
+        unsigned bps;
+        int rc;
+
+        bps = uint16_t_le2host(bs->bps);
+        
+        for (i = 0; i < bs->spc; i++) {
+                rc = _fat_block_get(&b, bs, dev_handle, c, i,
                     BLOCK_FLAGS_NOREAD);
                 if (rc != EOK)
                         return rc;
-                memset(b->data, 0, BPS(bs));
+                memset(b->data, 0, bps);
                 b->dirty = true;
                 rc = block_put(b);

uspace/srv/fs/fat/fat_fat.h

@@ -64 +64 @@
     fat_cluster_t *, uint16_t *, uint16_t);
 
-extern int fat_block_get(block_t **, struct fat_bs *, struct fat_node *,
-    aoff64_t, int);
+#define fat_block_get(b, bs, np, bn, flags) \
+    _fat_block_get((b), (bs), (np)->idx->dev_handle, (np)->firstc, (bn), \
+    (flags))
+
 extern int _fat_block_get(block_t **, struct fat_bs *, dev_handle_t,
-    fat_cluster_t, fat_cluster_t *, aoff64_t, int);
+    fat_cluster_t, aoff64_t, int);
 
 extern int fat_append_clusters(struct fat_bs *, struct fat_node *,
-    fat_cluster_t, fat_cluster_t);
+    fat_cluster_t);
 extern int fat_chop_clusters(struct fat_bs *, struct fat_node *,
     fat_cluster_t);

uspace/srv/fs/fat/fat_ops.c

@@ -60 +60 @@
 #define FS_NODE(node)   ((node) ? (node)->bp : NULL)
 
-#define DPS(bs)         (BPS((bs)) / sizeof(fat_dentry_t))
-#define BPC(bs)         (BPS((bs)) * SPC((bs)))
-
 /** Mutex protecting the list of cached free FAT nodes. */
 static FIBRIL_MUTEX_INITIALIZE(ffn_mutex);
@@ -104 +101 @@
         node->refcnt = 0;
         node->dirty = false;
-        node->lastc_cached_valid = false;
-        node->lastc_cached_value = FAT_CLST_LAST1;
-        node->currc_cached_valid = false;
-        node->currc_cached_bn = 0;
-        node->currc_cached_value = FAT_CLST_LAST1;
 }
 
@@ -116 +108 @@
         fat_bs_t *bs;
         fat_dentry_t *d;
+        uint16_t bps;
+        unsigned dps;
         int rc;
         
@@ -121 +115 @@
 
         bs = block_bb_get(node->idx->dev_handle);
+        bps = uint16_t_le2host(bs->bps);
+        dps = bps / sizeof(fat_dentry_t);
         
         /* Read the block that contains the dentry of interest. */
         rc = _fat_block_get(&b, bs, node->idx->dev_handle, node->idx->pfc,
-            NULL, (node->idx->pdi * sizeof(fat_dentry_t)) / BPS(bs),
-            BLOCK_FLAGS_NONE);
+            (node->idx->pdi * sizeof(fat_dentry_t)) / bps, BLOCK_FLAGS_NONE);
         if (rc != EOK)
                 return rc;
 
-        d = ((fat_dentry_t *)b->data) + (node->idx->pdi % DPS(bs));
+        d = ((fat_dentry_t *)b->data) + (node->idx->pdi % dps);
 
         d->firstc = host2uint16_t_le(node->firstc);
@@ -271 +266 @@
         fat_dentry_t *d;
         fat_node_t *nodep = NULL;
+        unsigned bps;
+        unsigned spc;
+        unsigned dps;
         int rc;
 
@@ -300 +298 @@
 
         bs = block_bb_get(idxp->dev_handle);
+        bps = uint16_t_le2host(bs->bps);
+        spc = bs->spc;
+        dps = bps / sizeof(fat_dentry_t);
 
         /* Read the block that contains the dentry of interest. */
-        rc = _fat_block_get(&b, bs, idxp->dev_handle, idxp->pfc, NULL,
-            (idxp->pdi * sizeof(fat_dentry_t)) / BPS(bs), BLOCK_FLAGS_NONE);
+        rc = _fat_block_get(&b, bs, idxp->dev_handle, idxp->pfc,
+            (idxp->pdi * sizeof(fat_dentry_t)) / bps, BLOCK_FLAGS_NONE);
         if (rc != EOK) {
                 (void) fat_node_put(FS_NODE(nodep));
@@ -309 +310 @@
         }
 
-        d = ((fat_dentry_t *)b->data) + (idxp->pdi % DPS(bs));
+        d = ((fat_dentry_t *)b->data) + (idxp->pdi % dps);
         if (d->attr & FAT_ATTR_SUBDIR) {
                 /* 
@@ -329 +330 @@
                         return rc;
                 }
-                nodep->size = BPS(bs) * SPC(bs) * clusters;
+                nodep->size = bps * spc * clusters;
         } else {
                 nodep->type = FAT_FILE;
@@ -367 +368 @@
         char name[FAT_NAME_LEN + 1 + FAT_EXT_LEN + 1];
         unsigned i, j;
+        unsigned bps;           /* bytes per sector */
+        unsigned dps;           /* dentries per sector */
         unsigned blocks;
         fat_dentry_t *d;
@@ -374 +377 @@
         fibril_mutex_lock(&parentp->idx->lock);
         bs = block_bb_get(parentp->idx->dev_handle);
-        blocks = parentp->size / BPS(bs);
+        bps = uint16_t_le2host(bs->bps);
+        dps = bps / sizeof(fat_dentry_t);
+        blocks = parentp->size / bps;
         for (i = 0; i < blocks; i++) {
                 rc = fat_block_get(&b, bs, parentp, i, BLOCK_FLAGS_NONE);
@@ -381 +386 @@
                         return rc;
                 }
-                for (j = 0; j < DPS(bs); j++) { 
+                for (j = 0; j < dps; j++) { 
                         d = ((fat_dentry_t *)b->data) + j;
                         switch (fat_classify_dentry(d)) {
@@ -409 +414 @@
                                 fat_idx_t *idx = fat_idx_get_by_pos(
                                     parentp->idx->dev_handle, parentp->firstc,
-                                    i * DPS(bs) + j);
+                                    i * dps + j);
                                 fibril_mutex_unlock(&parentp->idx->lock);
                                 if (!idx) {
@@ -508 +513 @@
         fat_bs_t *bs;
         fat_cluster_t mcl, lcl;
+        uint16_t bps;
         int rc;
 
         bs = block_bb_get(dev_handle);
+        bps = uint16_t_le2host(bs->bps);
         if (flags & L_DIRECTORY) {
                 /* allocate a cluster */
@@ -539 +546 @@
                 nodep->type = FAT_DIRECTORY;
                 nodep->firstc = mcl;
-                nodep->size = BPS(bs) * SPC(bs);
+                nodep->size = bps * bs->spc;
         } else {
                 nodep->type = FAT_FILE;
@@ -602 +609 @@
         block_t *b;
         unsigned i, j;
+        uint16_t bps;
+        unsigned dps;
         unsigned blocks;
         fat_cluster_t mcl, lcl;
@@ -631 +640 @@
         fibril_mutex_lock(&parentp->idx->lock);
         bs = block_bb_get(parentp->idx->dev_handle);
-
-        blocks = parentp->size / BPS(bs);
+        bps = uint16_t_le2host(bs->bps);
+        dps = bps / sizeof(fat_dentry_t);
+
+        blocks = parentp->size / bps;
 
         for (i = 0; i < blocks; i++) {
@@ -640 +651 @@
                         return rc;
                 }
-                for (j = 0; j < DPS(bs); j++) {
+                for (j = 0; j < dps; j++) {
                         d = ((fat_dentry_t *)b->data) + j;
                         switch (fat_classify_dentry(d)) {
@@ -680 +691 @@
                 return rc;
         }
-        rc = fat_append_clusters(bs, parentp, mcl, lcl);
+        rc = fat_append_clusters(bs, parentp, mcl);
         if (rc != EOK) {
                 (void) fat_free_clusters(bs, parentp->idx->dev_handle, mcl);
@@ -686 +697 @@
                 return rc;
         }
-        parentp->size += BPS(bs) * SPC(bs);
+        parentp->size += bps * bs->spc;
         parentp->dirty = true;          /* need to sync node */
         rc = fat_block_get(&b, bs, parentp, i, BLOCK_FLAGS_NONE);
@@ -760 +771 @@
 
         childp->idx->pfc = parentp->firstc;
-        childp->idx->pdi = i * DPS(bs) + j;
+        childp->idx->pdi = i * dps + j;
         fibril_mutex_unlock(&childp->idx->lock);
 
@@ -782 +793 @@
         fat_bs_t *bs;
         fat_dentry_t *d;
+        uint16_t bps;
         block_t *b;
         bool has_children;
@@ -800 +812 @@
         fibril_mutex_lock(&childp->idx->lock);
         bs = block_bb_get(childp->idx->dev_handle);
+        bps = uint16_t_le2host(bs->bps);
 
         rc = _fat_block_get(&b, bs, childp->idx->dev_handle, childp->idx->pfc,
-            NULL, (childp->idx->pdi * sizeof(fat_dentry_t)) / BPS(bs),
+            (childp->idx->pdi * sizeof(fat_dentry_t)) / bps,
             BLOCK_FLAGS_NONE);
         if (rc != EOK) 
                 goto error;
         d = (fat_dentry_t *)b->data +
-            (childp->idx->pdi % (BPS(bs) / sizeof(fat_dentry_t)));
+            (childp->idx->pdi % (bps / sizeof(fat_dentry_t)));
         /* mark the dentry as not-currently-used */
         d->name[0] = FAT_DENTRY_ERASED;
@@ -839 +852 @@
         fat_bs_t *bs;
         fat_node_t *nodep = FAT_NODE(fn);
+        unsigned bps;
+        unsigned dps;
         unsigned blocks;
         block_t *b;
@@ -851 +866 @@
         fibril_mutex_lock(&nodep->idx->lock);
         bs = block_bb_get(nodep->idx->dev_handle);
-
-        blocks = nodep->size / BPS(bs);
+        bps = uint16_t_le2host(bs->bps);
+        dps = bps / sizeof(fat_dentry_t);
+
+        blocks = nodep->size / bps;
 
         for (i = 0; i < blocks; i++) {
@@ -862 +879 @@
                         return rc;
                 }
-                for (j = 0; j < DPS(bs); j++) {
+                for (j = 0; j < dps; j++) {
                         d = ((fat_dentry_t *)b->data) + j;
                         switch (fat_classify_dentry(d)) {
@@ -959 +976 @@
         enum cache_mode cmode;
         fat_bs_t *bs;
+        uint16_t bps;
+        uint16_t rde;
         
         /* Accept the mount options */
@@ -995 +1014 @@
         bs = block_bb_get(dev_handle);
         
-        if (BPS(bs) != BS_SIZE) {
+        /* Read the number of root directory entries. */
+        bps = uint16_t_le2host(bs->bps);
+        rde = uint16_t_le2host(bs->root_ent_max);
+
+        if (bps != BS_SIZE) {
                 block_fini(dev_handle);
                 ipc_answer_0(rid, ENOTSUP);
@@ -1002 +1025 @@
 
         /* Initialize the block cache */
-        rc = block_cache_init(dev_handle, BPS(bs), 0 /* XXX */, cmode);
+        rc = block_cache_init(dev_handle, bps, 0 /* XXX */, cmode);
         if (rc != EOK) {
                 block_fini(dev_handle);
@@ -1064 +1087 @@
         rootp->refcnt = 1;
         rootp->lnkcnt = 0;      /* FS root is not linked */
-        rootp->size = RDE(bs) * sizeof(fat_dentry_t);
+        rootp->size = rde * sizeof(fat_dentry_t);
         rootp->idx = ridxp;
         ridxp->nodep = rootp;
@@ -1142 +1165 @@
         fat_node_t *nodep;
         fat_bs_t *bs;
+        uint16_t bps;
         size_t bytes;
         block_t *b;
@@ -1167 +1191 @@
 
         bs = block_bb_get(dev_handle);
+        bps = uint16_t_le2host(bs->bps);
 
         if (nodep->type == FAT_FILE) {
@@ -1179 +1204 @@
                         (void) async_data_read_finalize(callid, NULL, 0);
                 } else {
-                        bytes = min(len, BPS(bs) - pos % BPS(bs));
+                        bytes = min(len, bps - pos % bps);
                         bytes = min(bytes, nodep->size - pos);
-                        rc = fat_block_get(&b, bs, nodep, pos / BPS(bs),
+                        rc = fat_block_get(&b, bs, nodep, pos / bps,
                             BLOCK_FLAGS_NONE);
                         if (rc != EOK) {
@@ -1189 +1214 @@
                                 return;
                         }
-                        (void) async_data_read_finalize(callid,
-                            b->data + pos % BPS(bs), bytes);
+                        (void) async_data_read_finalize(callid, b->data + pos % bps,
+                            bytes);
                         rc = block_put(b);
                         if (rc != EOK) {
@@ -1205 +1230 @@
 
                 assert(nodep->type == FAT_DIRECTORY);
-                assert(nodep->size % BPS(bs) == 0);
-                assert(BPS(bs) % sizeof(fat_dentry_t) == 0);
+                assert(nodep->size % bps == 0);
+                assert(bps % sizeof(fat_dentry_t) == 0);
 
                 /*
@@ -1214 +1239 @@
                  * the position pointer accordingly.
                  */
-                bnum = (pos * sizeof(fat_dentry_t)) / BPS(bs);
-                while (bnum < nodep->size / BPS(bs)) {
+                bnum = (pos * sizeof(fat_dentry_t)) / bps;
+                while (bnum < nodep->size / bps) {
                         aoff64_t o;
 
@@ -1222 +1247 @@
                         if (rc != EOK)
                                 goto err;
-                        for (o = pos % (BPS(bs) / sizeof(fat_dentry_t));
-                            o < BPS(bs) / sizeof(fat_dentry_t);
+                        for (o = pos % (bps / sizeof(fat_dentry_t));
+                            o < bps / sizeof(fat_dentry_t);
                             o++, pos++) {
                                 d = ((fat_dentry_t *)b->data) + o;
@@ -1281 +1306 @@
         size_t bytes, size;
         block_t *b;
+        uint16_t bps;
+        unsigned spc;
+        unsigned bpc;           /* bytes per cluster */
         aoff64_t boundary;
         int flags = BLOCK_FLAGS_NONE;
@@ -1306 +1334 @@
 
         bs = block_bb_get(dev_handle);
+        bps = uint16_t_le2host(bs->bps);
+        spc = bs->spc;
+        bpc = bps * spc;
 
         /*
@@ -1314 +1345 @@
          * value signalizing a smaller number of bytes written. 
          */ 
-        bytes = min(len, BPS(bs) - pos % BPS(bs));
-        if (bytes == BPS(bs))
+        bytes = min(len, bps - pos % bps);
+        if (bytes == bps)
                 flags |= BLOCK_FLAGS_NOREAD;
         
-        boundary = ROUND_UP(nodep->size, BPC(bs));
+        boundary = ROUND_UP(nodep->size, bpc);
         if (pos < boundary) {
                 /*
@@ -1333 +1364 @@
                         return;
                 }
-                rc = fat_block_get(&b, bs, nodep, pos / BPS(bs), flags);
+                rc = fat_block_get(&b, bs, nodep, pos / bps, flags);
                 if (rc != EOK) {
                         (void) fat_node_put(fn);
@@ -1340 +1371 @@
                         return;
                 }
-                (void) async_data_write_finalize(callid,
-                    b->data + pos % BPS(bs), bytes);
+                (void) async_data_write_finalize(callid, b->data + pos % bps,
+                    bytes);
                 b->dirty = true;                /* need to sync block */
                 rc = block_put(b);
@@ -1365 +1396 @@
                 fat_cluster_t mcl, lcl; 
  
-                nclsts = (ROUND_UP(pos + bytes, BPC(bs)) - boundary) / BPC(bs);
+                nclsts = (ROUND_UP(pos + bytes, bpc) - boundary) / bpc;
                 /* create an independent chain of nclsts clusters in all FATs */
                 rc = fat_alloc_clusters(bs, dev_handle, nclsts, &mcl, &lcl);
@@ -1384 +1415 @@
                         return;
                 }
-                rc = _fat_block_get(&b, bs, dev_handle, lcl, NULL,
-                    (pos / BPS(bs)) % SPC(bs), flags);
+                rc = _fat_block_get(&b, bs, dev_handle, lcl, (pos / bps) % spc,
+                    flags);
                 if (rc != EOK) {
                         (void) fat_free_clusters(bs, dev_handle, mcl);
@@ -1393 +1424 @@
                         return;
                 }
-                (void) async_data_write_finalize(callid,
-                    b->data + pos % BPS(bs), bytes);
+                (void) async_data_write_finalize(callid, b->data + pos % bps,
+                    bytes);
                 b->dirty = true;                /* need to sync block */
                 rc = block_put(b);
@@ -1407 +1438 @@
                  * node's cluster chain.
                  */
-                rc = fat_append_clusters(bs, nodep, mcl, lcl);
+                rc = fat_append_clusters(bs, nodep, mcl);
                 if (rc != EOK) {
                         (void) fat_free_clusters(bs, dev_handle, mcl);
@@ -1431 +1462 @@
         fat_node_t *nodep;
         fat_bs_t *bs;
+        uint16_t bps;
+        uint8_t spc;
+        unsigned bpc;   /* bytes per cluster */
         int rc;
 
@@ -1445 +1479 @@
 
         bs = block_bb_get(dev_handle);
+        bps = uint16_t_le2host(bs->bps);
+        spc = bs->spc;
+        bpc = bps * spc;
 
         if (nodep->size == size) {
@@ -1454 +1491 @@
                  */
                 rc = EINVAL;
-        } else if (ROUND_UP(nodep->size, BPC(bs)) == ROUND_UP(size, BPC(bs))) {
+        } else if (ROUND_UP(nodep->size, bpc) == ROUND_UP(size, bpc)) {
                 /*
                  * The node will be shrunk, but no clusters will be deallocated.
@@ -1472 +1509 @@
                         fat_cluster_t lastc;
                         rc = fat_cluster_walk(bs, dev_handle, nodep->firstc,
-                            &lastc, NULL, (size - 1) / BPC(bs));
+                            &lastc, NULL, (size - 1) / bpc);
                         if (rc != EOK)
                                 goto out;