Changeset f4ae95a in mainline for uspace/srv/fs/fat/fat_ops.c

Timestamp:

2017-07-02T16:22:09Z (7 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

a927398

Parents:

ee50130

Message:

mkfat needs to be able to set the volume label. fat FS should ignore volume label in the boot sector.

File:

• uspace/srv/fs/fat/fat_ops.c (modified) (3 diffs)

uspace/srv/fs/fat/fat_ops.c

@@ -1039 +1039 @@
 static int fat_fsprobe(service_id_t service_id, vfs_fs_probe_info_t *info)
 {
-        fat_bs_t *bs;
         fat_idx_t *ridxp;
         fs_node_t *rfn;
@@ -1045 +1044 @@
         fat_directory_t di;
         char label[FAT_VOLLABEL_LEN + 1];
-        int i;
         int rc;
 
@@ -1060 +1058 @@
         rc = fat_directory_vollabel_get(&di, label);
         if (rc != EOK) {
-                /* No label in root directory. Read label from the BS */
-                bs = block_bb_get(service_id);
-                i = FAT_VOLLABEL_LEN;
-                while (i > 0 && bs->label[i - 1] == FAT_PAD)
-                        --i;
-
-                /* XXX Deal with non-ASCII characters */
-                memcpy(label, bs->label, i);
-                label[i] = '\0';
+                if (rc != ENOENT)
+                        return rc;
+
+                label[0] = '\0';
         }