From c40c1c52d68049434b1379c3a6d8652a1363bb07 Mon Sep 17 00:00:00 2001 From: bigbiff Date: Sat, 1 Nov 2014 09:34:57 -0400 Subject: This patchset causes issues with backups. Revert "update exfat from current head" This reverts commit 2e33c5ee0b1a1ece068489e8fd99f3e4eb3501b5. Change-Id: I00d19d98f721bb50aa937ca15b11fe3491132fcd --- exfat/mkfs/cbm.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'exfat/mkfs/cbm.c') diff --git a/exfat/mkfs/cbm.c b/exfat/mkfs/cbm.c index 189ae32fd..0110b4065 100644 --- a/exfat/mkfs/cbm.c +++ b/exfat/mkfs/cbm.c @@ -3,7 +3,7 @@ Clusters Bitmap creation code. Free exFAT implementation. - Copyright (C) 2011-2014 Andrew Nayenko + Copyright (C) 2011-2013 Andrew Nayenko This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -21,7 +21,6 @@ */ #include -#include #include "cbm.h" #include "fat.h" #include "uct.h" @@ -46,23 +45,22 @@ static int cbm_write(struct exfat_dev* dev) DIV_ROUND_UP(uct.get_size(), get_cluster_size()) + DIV_ROUND_UP(rootdir.get_size(), get_cluster_size()); size_t bitmap_size = DIV_ROUND_UP(allocated_clusters, CHAR_BIT); - bitmap_t* bitmap = malloc(BMAP_SIZE(bitmap_size)); + uint8_t* bitmap = malloc(bitmap_size); size_t i; if (bitmap == NULL) { - exfat_error("failed to allocate bitmap of %zu bytes", - BMAP_SIZE(bitmap_size)); + exfat_error("failed to allocate bitmap of %zu bytes", bitmap_size); return 1; } - memset(bitmap, 0, BMAP_SIZE(bitmap_size)); for (i = 0; i < bitmap_size * CHAR_BIT; i++) if (i < allocated_clusters) BMAP_SET(bitmap, i); + else + BMAP_CLR(bitmap, i); if (exfat_write(dev, bitmap, bitmap_size) < 0) { - free(bitmap); exfat_error("failed to write bitmap of %zu bytes", bitmap_size); return 1; } -- cgit v1.2.3