Changeset 6284978 in mainline for uspace/srv

Timestamp:

2008-11-02T10:21:31Z (17 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

0c243b4

Parents:

2953f9a

Message:

Separate the block_init() phase from reading of the boot block.

Location:

uspace/srv/fs

Files:

• fat/fat_ops.c (modified) (1 diff)
• tmpfs/tmpfs_dump.c (modified) (1 diff)

uspace/srv/fs/fat/fat_ops.c

@@ -435 +435 @@
 
         /* initialize libblock */
-        rc = block_init(dev_handle, BS_SIZE, BS_BLOCK * BS_SIZE, BS_SIZE);
+        rc = block_init(dev_handle, BS_SIZE);
         if (rc != EOK) {
-                ipc_answer_0(rid, 0);
+                ipc_answer_0(rid, rc);
+                return;
+        }
+
+        /* prepare the boot block */
+        rc = block_bb_read(dev_handle, BS_BLOCK * BS_SIZE, BS_SIZE);
+        if (rc != EOK) {
+                block_fini(dev_handle);
+                ipc_answer_0(rid, rc);
                 return;
         }

uspace/srv/fs/tmpfs/tmpfs_dump.c

@@ -161 +161 @@
         int rc;
 
-        rc = block_init(dev, TMPFS_BLOCK_SIZE, 0, 0);
+        rc = block_init(dev, TMPFS_BLOCK_SIZE);
         if (rc != EOK)
                 return false;