From fcdd44470dd7b09e9a40bde9e1b61b7c70759b89 Mon Sep 17 00:00:00 2001 From: Anand Jain Date: Tue, 15 Jul 2014 16:02:10 +0800 Subject: [PATCH] btrfs-progs: define BTRFS_MKFS_SMALL_VOLUME_SIZE for small volume mkfs cut of size '1024 * 1024 * 1024' to mark dev as small volume so to force mixed group. Use a define for that. Signed-off-by: Anand Jain Signed-off-by: David Sterba --- mkfs.c | 2 +- utils.c | 4 ++-- utils.h | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/mkfs.c b/mkfs.c index cba4f02..d980d4a 100644 --- a/mkfs.c +++ b/mkfs.c @@ -1335,7 +1335,7 @@ int main(int ac, char **av) break; case 'b': block_count = parse_size(optarg); - if (block_count <= 1024*1024*1024) { + if (block_count <= BTRFS_MKFS_SMALL_VOLUME_SIZE) { fprintf(stdout, "SMALL VOLUME: forcing mixed metadata/data groups\n"); mixed = 1; diff --git a/utils.c b/utils.c index f9ad946..87424fe 100644 --- a/utils.c +++ b/utils.c @@ -702,7 +702,7 @@ int btrfs_prepare_device(int fd, char *file, int zero_end, u64 *block_count_ret, if (max_block_count) block_count = min(block_count, max_block_count); - if (block_count < 1024 * 1024 * 1024 && !(*mixed)) { + if (block_count < BTRFS_MKFS_SMALL_VOLUME_SIZE && !(*mixed)) { printf("SMALL VOLUME: forcing mixed metadata/data groups\n"); *mixed = 1; } @@ -2287,7 +2287,7 @@ int is_vol_small(char *file) close(fd); return -1; } - if (size < 1024 * 1024 * 1024) { + if (size < BTRFS_MKFS_SMALL_VOLUME_SIZE) { close(fd); return 1; } else { diff --git a/utils.h b/utils.h index e29ab93..d7d2ad5 100644 --- a/utils.h +++ b/utils.h @@ -24,6 +24,7 @@ #include #define BTRFS_MKFS_SYSTEM_GROUP_SIZE (4 * 1024 * 1024) +#define BTRFS_MKFS_SMALL_VOLUME_SIZE (1024 * 1024 * 1024) #define BTRFS_SCAN_PROC (1ULL << 0) #define BTRFS_SCAN_DEV (1ULL << 1) -- 2.7.4