Changes in / [e231d26:0f3744d] in mainline

Location:

uspace/srv/fs/fat

Files:

• fat.h (modified) (1 diff)
• fat_ops.c (modified) (2 diffs)

uspace/srv/fs/fat/fat.h

@@ -141 +141 @@
 } __attribute__ ((packed)) fat_bs_t;
 
+#define FAT32_FSINFO_SIG1       "RRaA"
+#define FAT32_FSINFO_SIG2       "rrAa"
+#define FAT32_FSINFO_SIG3       "\x00\x00\x55\xaa"
+
+typedef struct {
+        uint8_t sig1[4];
+        uint8_t res1[480];
+        uint8_t sig2[4];
+        uint32_t free_clusters;
+        uint32_t last_allocated_cluster;
+        uint8_t res2[12];
+        uint8_t sig3[4];
+} __attribute__ ((packed)) fat32_fsinfo_t;
+
 typedef enum {
         FAT_INVALID,

uspace/srv/fs/fat/fat_ops.c

@@ -1025 +1025 @@
 }
 
+static int fat_update_fat32_fsinfo(service_id_t service_id)
+{
+        fat_bs_t *bs;
+        fat32_fsinfo_t *info;
+        block_t *b;
+        int rc;
+
+        bs = block_bb_get(service_id);
+        assert(FAT_IS_FAT32(bs));
+
+        rc = block_get(&b, service_id, uint16_t_le2host(bs->fat32.fsinfo_sec),
+            BLOCK_FLAGS_NONE);
+        if (rc != EOK)
+                return rc;
+
+        info = (fat32_fsinfo_t *) b->data;
+
+        if (bcmp(info->sig1, FAT32_FSINFO_SIG1, sizeof(info->sig1)) ||
+            bcmp(info->sig2, FAT32_FSINFO_SIG2, sizeof(info->sig2)) ||
+            bcmp(info->sig3, FAT32_FSINFO_SIG3, sizeof(info->sig3))) {
+                (void) block_put(b);
+                return EINVAL;
+        }
+
+        /* For now, invalidate the counter. */
+        info->free_clusters = host2uint16_t_le(-1);
+
+        b->dirty = true;
+        return block_put(b);
+}
+
 static int fat_unmounted(service_id_t service_id)
 {
         fs_node_t *fn;
         fat_node_t *nodep;
-        int rc;
+        fat_bs_t *bs;
+        int rc;
+
+        bs = block_bb_get(service_id);
 
         rc = fat_root_get(&fn, service_id);
@@ -1043 +1077 @@
                 (void) fat_node_put(fn);
                 return EBUSY;
+        }
+
+        if (FAT_IS_FAT32(bs)) {
+                /*
+                 * Attempt to update the FAT32 FS info.
+                 */
+                (void) fat_update_fat32_fsinfo(service_id);
         }