Changeset 395df52 in mainline for uspace/srv/fs/exfat

Timestamp:

2017-05-12T19:58:27Z (9 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.

Location:

uspace/srv/fs/exfat

Files:

• exfat_fat.c (modified) (1 diff)
• exfat_fat.h (modified) (1 diff)
• exfat_ops.c (modified) (2 diffs)

uspace/srv/fs/exfat/exfat_fat.c

@@ -540 +540 @@
  * does not contain a exfat file system.
  */
-int exfat_sanity_check(exfat_bs_t *bs, service_id_t service_id)
+int exfat_sanity_check(exfat_bs_t *bs)
 {
         if (str_cmp((char const *)bs->oem_name, "EXFAT   "))

uspace/srv/fs/exfat/exfat_fat.h

@@ -72 +72 @@
 extern int exfat_set_cluster(struct exfat_bs *, service_id_t, exfat_cluster_t,
     exfat_cluster_t);
-extern int exfat_sanity_check(struct exfat_bs *, service_id_t);
+extern int exfat_sanity_check(struct exfat_bs *);
 
 extern int exfat_append_clusters(struct exfat_bs *, struct exfat_node *,

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;