diff options
| -rw-r--r-- | mkfs/main.c | 22 | ||||
| -rw-r--r-- | utils.c | 2 | ||||
| -rw-r--r-- | utils.h | 1 |
3 files changed, 22 insertions, 3 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) @@ -447,7 +447,7 @@ int is_mount_point(const char *path) return ret; } -static int is_reg_file(const char *path) +int is_reg_file(const char *path) { struct stat statbuf; @@ -123,6 +123,7 @@ char *__strncpy_null(char *dest, const char *src, size_t n); int is_block_device(const char *file); int is_mount_point(const char *file); int is_path_exist(const char *file); +int is_reg_file(const char *path); int check_arg_type(const char *input); int open_path_or_dev_mnt(const char *path, DIR **dirstream, int verbose); int btrfs_open(const char *path, DIR **dirstream, int verbose, int dir_only); |