Changeset 684b655 in mainline for uspace/srv/fs/fat/fat_fat.c

Timestamp:

2009-09-03T12:48:35Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

e402382

Parents:

cffce57

Message:

Make _fat_block_get() return an error code.

File:

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

uspace/srv/fs/fat/fat_fat.c

@@ -114 +114 @@
 /** 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.
@@ -121 +122 @@
  * @param flags         Flags passed to libblock.
  *
- * @return              Block structure holding the requested block.
- */
-block_t *
-_fat_block_get(fat_bs_t *bs, dev_handle_t dev_handle, fat_cluster_t firstc,
-    bn_t bn, int flags)
-{
-        block_t *b;
+ * @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 firstc, bn_t bn, int flags)
+{
         unsigned bps;
         unsigned rscnt;         /* block address of the first FAT */
@@ -150 +150 @@
                 /* root directory special case */
                 assert(bn < rds);
-                rc = block_get(&b, dev_handle, rscnt + bs->fatcnt * sf + bn,
+                rc = block_get(block, dev_handle, rscnt + bs->fatcnt * sf + bn,
                     flags);
-                assert(rc == EOK);
-                return b;
+                return rc;
         }
 
@@ -161 +160 @@
         assert(clusters == max_clusters);
 
-        rc = block_get(&b, dev_handle, ssa +
-            (lastc - FAT_CLST_FIRST) * bs->spc + bn % bs->spc, flags);
-        assert(rc == EOK);
-
-        return b;
+        rc = block_get(block, dev_handle,
+            ssa + (lastc - FAT_CLST_FIRST) * bs->spc + bn % bs->spc, flags);
+
+        return rc;
 }
 
@@ -196 +194 @@
                 int flags = (o % bps == 0) ?
                     BLOCK_FLAGS_NOREAD : BLOCK_FLAGS_NONE;
-                b = fat_block_get(bs, nodep, o / bps, flags);
+                rc = fat_block_get(&b, bs, nodep, o / bps, flags);
+                assert(rc == EOK);
                 memset(b->data + o % bps, 0, bps - o % bps);
                 b->dirty = true;                /* need to sync node */
@@ -208 +207 @@
         /* zero out the initial part of the new cluster chain */
         for (o = boundary; o < pos; o += bps) {
-                b = _fat_block_get(bs, nodep->idx->dev_handle, mcl,
+                rc = _fat_block_get(&b, bs, nodep->idx->dev_handle, mcl,
                     (o - boundary) / bps, BLOCK_FLAGS_NOREAD);
+                assert(rc == EOK);
                 memset(b->data, 0, min(bps, pos - o));
                 b->dirty = true;                /* need to sync node */
@@ -481 +481 @@
         
         for (i = 0; i < bs->spc; i++) {
-                b = _fat_block_get(bs, dev_handle, c, i, BLOCK_FLAGS_NOREAD);
+                rc = _fat_block_get(&b, bs, dev_handle, c, i,
+                    BLOCK_FLAGS_NOREAD);
+                assert(rc == EOK);
                 memset(b->data, 0, bps);
                 b->dirty = true;