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 <anand.j...@oracle.com>
---
 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 159f2a2..673134e 100644
--- a/utils.c
+++ b/utils.c
@@ -705,7 +705,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;
        }
@@ -2351,7 +2351,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 5bc22ec..ddf31cf 100644
--- a/utils.h
+++ b/utils.h
@@ -24,6 +24,7 @@
 #include <dirent.h>
 
 #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.0.0.153.g79dcccc

--
To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to