Changeset 395df52 in mainline for uspace/srv/fs/exfat/exfat_ops.c

Timestamp:

2017-05-12T19:58:27Z (8 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

e48947e

Parents:

de5b708

Message:

Probing for ExFAT, Ext4 and CDFS.

File:

• uspace/srv/fs/exfat/exfat_ops.c (modified) (2 diffs)

uspace/srv/fs/exfat/exfat_ops.c

@@ -1053 +1053 @@
 static int exfat_fsprobe(service_id_t service_id, vfs_fs_probe_info_t *info)
 {
-        return ENOTSUP;
+        int rc;
+        exfat_bs_t *bs;
+
+        /* initialize libblock */
+        rc = block_init(service_id, BS_SIZE);
+        if (rc != EOK)
+                return rc;
+
+        /* prepare the boot block */
+        rc = block_bb_read(service_id, BS_BLOCK);
+        if (rc != EOK) {
+                block_fini(service_id);
+                return rc;
+        }
+
+        /* get the buffer with the boot sector */
+        bs = block_bb_get(service_id);
+
+        /* Do some simple sanity checks on the file system. */
+        rc = exfat_sanity_check(bs);
+
+        (void) block_cache_fini(service_id);
+        block_fini(service_id);
+        return rc;
 }
 
@@ -1086 +1109 @@
         bs = block_bb_get(service_id);
 
+        /* Do some simple sanity checks on the file system. */
+        rc = exfat_sanity_check(bs);
+        if (rc != EOK) {
+                (void) block_cache_fini(service_id);
+                block_fini(service_id);
+                return rc;
+        }
+
         /* Initialize the block cache */
         rc = block_cache_init(service_id, BPS(bs), 0 /* XXX */, cmode);
         if (rc != EOK) {
-                block_fini(service_id);
-                return rc;
-        }
-
-        /* Do some simple sanity checks on the file system. */
-        rc = exfat_sanity_check(bs, service_id);
-        if (rc != EOK) {
-                (void) block_cache_fini(service_id);
                 block_fini(service_id);
                 return rc;