diff options
author | Qu Wenruo <wqu@suse.com> | 2017-11-29 16:42:05 +0800 |
---|---|---|
committer | David Sterba <dsterba@suse.com> | 2018-01-08 18:15:20 +0100 |
commit | 1733989352244572a0a53862c9377d21cbbcecf7 (patch) | |
tree | 1db0d547adbcb257a1bf6b82b407c35b9ac8418d /mkfs/main.c | |
parent | 0ca2f5a7241373c660946802b0d7f8305234c286 (diff) |
btrfs-progs: mkfs: Use the whole file or block device to mkfs for rootdir
For --rootdir, even for large existing file or block device, it will
always shrink the resulting filesystem.
The problem is, mkfs.btrfs will try to calculate the dir size, and use
it as @block_count to mkfs, which makes the filesystem shrunk.
Fix it by trying to get the original block device or file size as
@block_count, so mkfs.btrfs can use the full file/block device for
--rootdir option.
Signed-off-by: Qu Wenruo <wqu@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
Diffstat (limited to 'mkfs/main.c')
-rw-r--r-- | mkfs/main.c | 22 |
1 files changed, 20 insertions, 2 deletions
diff --git a/mkfs/main.c b/mkfs/main.c index 94d9ef03..d1b687d3 100644 --- a/mkfs/main.c +++ b/mkfs/main.c @@ -970,13 +970,31 @@ int main(int argc, char **argv) * This must be done before minimal device size checks. */ if (source_dir_set) { - fd = open(file, O_CREAT | O_RDWR, S_IRUSR | S_IWUSR | S_IRGRP | - S_IWGRP | S_IROTH); + int oflags = O_RDWR; + struct stat statbuf; + + if (is_path_exist(file) == 0) + oflags |= O_CREAT; + + fd = open(file, oflags, S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | + S_IROTH); if (fd < 0) { error("unable to open %s: %s", file, strerror(errno)); goto error; } + ret = fstat(fd, &statbuf); + if (ret < 0) { + error("unable to stat %s: %s", file, strerror(errno)); + ret = -errno; + goto error; + } + /* + * Block_count not specified, use file/device size first. + * Or we will always use source_dir_size calculated for mkfs. + */ + if (!block_count) + block_count = btrfs_device_size(fd, &statbuf); source_dir_size = btrfs_mkfs_size_dir(source_dir, sectorsize, min_dev_size, metadata_profile, data_profile); if (block_count < source_dir_size) |