Patchwork [5/6] vvfat: do not hardcode sector counts in error message

login
register
mail settings
Submitter Paolo Bonzini
Date Oct. 5, 2011, 7:12 a.m.
Message ID <1317798728-28938-6-git-send-email-pbonzini@redhat.com>
Download mbox | patch
Permalink /patch/117767/
State New
Headers show

Comments

Paolo Bonzini - Oct. 5, 2011, 7:12 a.m.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 block/vvfat.c |    7 ++-----
 1 files changed, 2 insertions(+), 5 deletions(-)

Patch

diff --git a/block/vvfat.c b/block/vvfat.c
index a682eae..fb3d62e 100644
--- a/block/vvfat.c
+++ b/block/vvfat.c
@@ -930,11 +930,8 @@  static int init_directories(BDRVVVFATState* s,
 	cluster = mapping->end;
 
 	if(cluster > s->cluster_count) {
-	    fprintf(stderr,"Directory does not fit in FAT%d (capacity %s)\n",
-		    s->fat_type,
-		    s->fat_type == 12 ? s->sector_count == 2880 ? "1.44 MB"
-								: "2.88 MB"
-				      : "504MB");
+	    fprintf(stderr,"Directory does not fit in FAT%d (capacity %.2f MB)\n",
+		    s->fat_type, s->sector_count / 2000.0);
 	    return -EINVAL;
 	}