X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=daemon%2Fmkfs.c;h=ad3014c3effb8b704f38c3bcb02ad61739ca94ba;hp=6735d24dca3b73e541eb47d2b575d0adf66b05e4;hb=4d5c22800214008b229e937dada2299de8353d9e;hpb=9e0b31a2af26b8d58a44dd80993a5e73d4942307

diff --git a/daemon/mkfs.c b/daemon/mkfs.c
index 6735d24..ad3014c 100644
--- a/daemon/mkfs.c
+++ b/daemon/mkfs.c
@@ -102,12 +102,46 @@ int
 do_mkfs_b (const char *fstype, int blocksize, const char *device)
 {
   const char *extra[2];
-  char blocksize_s[32];
+  char n[32];
 
-  snprintf (blocksize_s, sizeof blocksize_s, "%d", blocksize);
+  if (blocksize <= 0 || !is_power_of_2 (blocksize)) {
+    reply_with_error ("block size must be > 0 and a power of 2");
+    return -1;
+  }
 
-  extra[0] = "-b";
-  extra[1] = blocksize_s;
+  if (STREQ (fstype, "vfat") ||
+      STREQ (fstype, "msdos")) {
+    /* For VFAT map the blocksize into a cluster size.  However we
+     * have to determine the block device sector size in order to do
+     * this.
+     */
+    int sectorsize = do_blockdev_getss (device);
+    if (sectorsize == -1)
+      return -1;
+
+    int sectors_per_cluster = blocksize / sectorsize;
+    if (sectors_per_cluster < 1 || sectors_per_cluster > 128) {
+      reply_with_error ("unsupported cluster size for %s filesystem (requested cluster size = %d, sector size = %d, trying sectors per cluster = %d)",
+                        fstype, blocksize, sectorsize, sectors_per_cluster);
+      return -1;
+    }
+
+    snprintf (n, sizeof n, "%d", sectors_per_cluster);
+    extra[0] = "-s";
+    extra[1] = n;
+  }
+  else if (STREQ (fstype, "ntfs")) {
+    /* For NTFS map the blocksize into a cluster size. */
+    snprintf (n, sizeof n, "%d", blocksize);
+    extra[0] = "-c";
+    extra[1] = n;
+  }
+  else {
+    /* For all other filesystem types, try the -b option. */
+    snprintf (n, sizeof n, "%d", blocksize);
+    extra[0] = "-b";
+    extra[1] = n;
+  }
 
   return mkfs (fstype, device, extra, 2);
 }