path: root/mkfs.c
diff options
authorEric Sandeen <>2013-01-29 14:32:28 -0600
committerDavid Sterba <>2013-01-31 13:47:26 +0100
commit680a80ece109a2994ac9c59511fb8974ace12fd9 (patch)
treebc02ddccb077bc9b54747c173c3f46f90f328d9f /mkfs.c
parent7e08a9116d9d692e0e298197de55b6b5505373bf (diff)
btrfs-progs: fix mkfs.btrfs -r option
Commit 605e806166847872bb91831b397d58f95027975a broke the mkfs.btrfs -r option, because it calls make_btrfs without ever setting dev_block_count, in the -r case, so we tell it to make a filesystem of size 0. Then we wander into ENOSPC land and segfault. As a quick one-line-fix, just set the dev_block_count to the size of the destination image file. Signed-off-by: Eric Sandeen <>
Diffstat (limited to 'mkfs.c')
1 files changed, 2 insertions, 0 deletions
diff --git a/mkfs.c b/mkfs.c
index a129ec48..e46f1559 100644
--- a/mkfs.c
+++ b/mkfs.c
@@ -1384,6 +1384,8 @@ int main(int ac, char **av)
fprintf(stderr, "unable to zero the output file\n");
+ /* our "device" is the new image file */
+ dev_block_count = block_count;
ssd = is_ssd(file);