diff options
author | Ilya Dryomov <idryomov@gmail.com> | 2012-03-13 22:15:07 +0200 |
---|---|---|
committer | Ilya Dryomov <idryomov@gmail.com> | 2012-03-13 22:29:44 +0200 |
commit | 35d7b486b3e7655b812f67a7eec662dd31ffa302 (patch) | |
tree | 982797fbf2ea722002e46b589701ead6280a123a /mkfs.c | |
parent | 842a2fb01b0345d1d97a908c6838a7bb4ad1b679 (diff) |
Btrfs-progs: allow dup for data chunks in mixed mode
Before commit a46e7ff2 was merged it was possible to create dup for
data+metadata chunks (mixed mode) by giving -m raid1 -d raid1 -M to
mkfs. a46e7ff2 purposefully disabled behind the scenes profile
upgrading/downgrading, so give users a chance to pick dup explicitly and
bail if dup for data is requested in normal mode.
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
Diffstat (limited to 'mkfs.c')
-rw-r--r-- | mkfs.c | 16 |
1 files changed, 12 insertions, 4 deletions
@@ -258,17 +258,23 @@ static int create_raid_groups(struct btrfs_trans_handle *trans, if (metadata_profile & ~allowed) { fprintf(stderr, "unable to create FS with metadata " - "profile %llu (%llu devices)\n", metadata_profile, + "profile %llu (have %llu devices)\n", metadata_profile, num_devices); exit(1); } if (data_profile & ~allowed) { fprintf(stderr, "unable to create FS with data " - "profile %llu (%llu devices)\n", data_profile, + "profile %llu (have %llu devices)\n", data_profile, num_devices); exit(1); } + /* allow dup'ed data chunks only in mixed mode */ + if (!mixed && (data_profile & BTRFS_BLOCK_GROUP_DUP)) { + fprintf(stderr, "dup for data is allowed only in mixed mode\n"); + exit(1); + } + if (allowed & metadata_profile) { u64 meta_flags = BTRFS_BLOCK_GROUP_METADATA; @@ -329,7 +335,7 @@ static void print_usage(void) fprintf(stderr, "options:\n"); fprintf(stderr, "\t -A --alloc-start the offset to start the FS\n"); fprintf(stderr, "\t -b --byte-count total number of bytes in the FS\n"); - fprintf(stderr, "\t -d --data data profile, raid0, raid1, raid10 or single\n"); + fprintf(stderr, "\t -d --data data profile, raid0, raid1, raid10, dup or single\n"); fprintf(stderr, "\t -l --leafsize size of btree leaves\n"); fprintf(stderr, "\t -L --label set a label\n"); fprintf(stderr, "\t -m --metadata metadata profile, values like data profile\n"); @@ -355,10 +361,12 @@ static u64 parse_profile(char *s) return BTRFS_BLOCK_GROUP_RAID1; } else if (strcmp(s, "raid10") == 0) { return BTRFS_BLOCK_GROUP_RAID10; + } else if (strcmp(s, "dup") == 0) { + return BTRFS_BLOCK_GROUP_DUP; } else if (strcmp(s, "single") == 0) { return 0; } else { - fprintf(stderr, "Unknown option %s\n", s); + fprintf(stderr, "Unknown profile %s\n", s); print_usage(); } /* not reached */ |