Changeset 6132b59 in mainline

Timestamp:

2008-11-02T17:54:25Z (16 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

d5a720cf

Parents:

9df7918

Message:

Do not use/pass the superfluous block size argument to block_get().

Location:

uspace

Files:

• lib/libblock/libblock.c (modified) (1 diff)
• lib/libblock/libblock.h (modified) (1 diff)
• srv/fs/fat/fat_fat.c (modified) (6 diffs)

uspace/lib/libblock/libblock.c

@@ -359 +359 @@
  * @return                      Block structure.
  */
-block_t *block_get(dev_handle_t dev_handle, off_t boff, size_t bs)
+block_t *block_get(dev_handle_t dev_handle, off_t boff)
 {
         devcon_t *devcon;

uspace/lib/libblock/libblock.h

@@ -76 +76 @@
 extern int block_cache_init(dev_handle_t, size_t, unsigned);
 
-extern block_t *block_get(dev_handle_t, off_t, size_t);
+extern block_t *block_get(dev_handle_t, off_t);
 extern void block_put(block_t *);
 

uspace/srv/fs/fat/fat_fat.c

@@ -96 +96 @@
                 /* root directory special case */
                 assert(offset < rds);
-                b = block_get(dev_handle, rscnt + fatcnt * sf + offset, bps);
+                b = block_get(dev_handle, rscnt + fatcnt * sf + offset);
                 return b;
         }
@@ -109 +109 @@
                 fidx = clst % (bps / sizeof(fat_cluster_t));
                 /* read FAT1 */
-                b = block_get(dev_handle, rscnt + fsec, bps);
+                b = block_get(dev_handle, rscnt + fsec);
                 clst = uint16_t_le2host(((fat_cluster_t *)b->data)[fidx]);
                 assert(clst != FAT_CLST_BAD);
@@ -117 +117 @@
 
         b = block_get(dev_handle, ssa + (clst - FAT_CLST_FIRST) * spc +
-            offset % spc, bps);
+            offset % spc);
 
         return b;
@@ -164 +164 @@
                 fidx = clst % (bps / sizeof(fat_cluster_t));
                 /* read FAT1 */
-                b = block_get(dev_handle, rscnt + fsec, bps);
+                b = block_get(dev_handle, rscnt + fsec);
                 clst = uint16_t_le2host(((fat_cluster_t *)b->data)[fidx]);
                 assert(clst != FAT_CLST_BAD);
@@ -244 +244 @@
         assert(fatno < bs->fatcnt);
         b = block_get(dev_handle, rscnt + sf * fatno +
-            (clst * sizeof(fat_cluster_t)) / bps, bps);
+            (clst * sizeof(fat_cluster_t)) / bps);
         cp = (fat_cluster_t *)b->data + clst % (bps / sizeof(fat_cluster_t));
         *cp = host2uint16_t_le(value);
@@ -314 +314 @@
         futex_down(&fat_alloc_lock);
         for (b = 0, cl = 0; b < sf; blk++) {
-                blk = block_get(dev_handle, rscnt + b, bps);
+                blk = block_get(dev_handle, rscnt + b);
                 for (c = 0; c < bps / sizeof(fat_cluster_t); c++, cl++) {
                         fat_cluster_t *clst = (fat_cluster_t *)blk->data + c;