btrfs-progs: mkfs: do not truncate the image when --rootdir is set

With the rootdir option we try to guess the final size of the image and
fill it with zeros, preceded by truncation. After patch

"Btrfs-progs: Do not force mixed block group creation unless '-M' option
 is specified"

the misc test 002 will fail, because of the non-mixed mode. I think we
should not touch the image size (no change for block devices) and try to
fit into whatever is provided by user.

Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
David Sterba 2015-11-05 14:22:10 +01:00
parent e8a5f57b69
commit f2c844f65f
2 changed files with 31 additions and 1 deletions

2
mkfs.c
View File

@ -926,7 +926,7 @@ fail_no_dir:
static int open_target(char *output_name) static int open_target(char *output_name)
{ {
int output_fd; int output_fd;
output_fd = open(output_name, O_CREAT | O_RDWR | O_TRUNC, output_fd = open(output_name, O_CREAT | O_RDWR,
S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH); S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH);
return output_fd; return output_fd;

View File

@ -0,0 +1,30 @@
#!/bin/bash
# make sure that mkfs.btrfs --rootsize does not change size of the image
source $TOP/tests/common
check_prereq mkfs.btrfs
prepare_test_dev
test_mkfs_with_size() {
local size
local imgsize
local tmp
size="$1"
run_check truncate -s$size $TEST_DEV
imgsize=$(run_check_stdout stat --format=%s $TEST_DEV)
run_check $SUDO_HELPER $TOP/mkfs.btrfs -f \
--rootdir $TOP/Documentation \
$TEST_DEV
tmp=$(run_check_stdout stat --format=%s $TEST_DEV)
if ! [ "$imgsize" = "$tmp" ]; then
_fail "image size changed from $imgsize to $tmp"
fi
}
test_mkfs_with_size 128M
test_mkfs_with_size 256M
test_mkfs_with_size 512M
test_mkfs_with_size 1G
test_mkfs_with_size 2G