OSDN Git Service

Repairing: pass struct exfat to verify_vbr_checksum().
authorrelan <relan@users.noreply.github.com>
Sat, 11 Mar 2017 06:48:36 +0000 (09:48 +0300)
committerrelan <relan@users.noreply.github.com>
Sat, 15 Sep 2018 04:52:46 +0000 (07:52 +0300)
Repair hooks need struct exfat.

libexfat/mount.c

index cf8d3e8..eedb07c 100644 (file)
@@ -118,13 +118,13 @@ static void parse_options(struct exfat* ef, const char* options)
        }
 }
 
-static bool verify_vbr_checksum(struct exfat_dev* dev, void* sector,
-               off_t sector_size)
+static bool verify_vbr_checksum(const struct exfat* ef, void* sector)
 {
+       off_t sector_size = SECTOR_SIZE(*ef->sb);
        uint32_t vbr_checksum;
        int i;
 
-       if (exfat_pread(dev, sector, sector_size, 0) < 0)
+       if (exfat_pread(ef->dev, sector, sector_size, 0) < 0)
        {
                exfat_error("failed to read boot sector");
                return false;
@@ -132,7 +132,7 @@ static bool verify_vbr_checksum(struct exfat_dev* dev, void* sector,
        vbr_checksum = exfat_vbr_start_checksum(sector, sector_size);
        for (i = 1; i < 11; i++)
        {
-               if (exfat_pread(dev, sector, sector_size, i * sector_size) < 0)
+               if (exfat_pread(ef->dev, sector, sector_size, i * sector_size) < 0)
                {
                        exfat_error("failed to read VBR sector");
                        return false;
@@ -140,7 +140,7 @@ static bool verify_vbr_checksum(struct exfat_dev* dev, void* sector,
                vbr_checksum = exfat_vbr_add_checksum(sector, sector_size,
                                vbr_checksum);
        }
-       if (exfat_pread(dev, sector, sector_size, i * sector_size) < 0)
+       if (exfat_pread(ef->dev, sector, sector_size, i * sector_size) < 0)
        {
                exfat_error("failed to read VBR checksum sector");
                return false;
@@ -265,7 +265,7 @@ int exfat_mount(struct exfat* ef, const char* spec, const char* options)
                return -ENOMEM;
        }
        /* use zero_cluster as a temporary buffer for VBR checksum verification */
-       if (!verify_vbr_checksum(ef->dev, ef->zero_cluster, SECTOR_SIZE(*ef->sb)))
+       if (!verify_vbr_checksum(ef, ef->zero_cluster))
        {
                exfat_free(ef);
                return -EIO;