btrfs: add support for 4-copy replication (raid1c4)

Add new block group profile to store 4 copies in a simliar way that
current RAID1 does.  The profile attributes and constraints are defined
in the raid table and used by the same code that already handles the 2-
and 3-copy RAID1.

The minimum number of devices is 4, the maximum number of devices/chunks
that can be lost/damaged is 3. There is no comparable traditional RAID
level, the profile is added for future needs to accompany triple-parity
and beyond.

Signed-off-by: David Sterba <dsterba@suse.com>
(cherry picked from commit 501e343804320c22f6cafe417543f5039ef8c48a)

diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h
index 298ba2b89fef83e851b54ac30eb24338a8ab1e55..e7778f373f11eb76f45b063e9f8253e5a8273a5f 100644 (file)
--- a/fs/btrfs/ctree.h
+++ b/fs/btrfs/ctree.h
@@ -56,9 +56,9 @@ struct btrfs_ref;
  * filesystem data as well that can be used to read data in order to repair
  * read errors on other disks.
  *
- * Current value is derived from RAID1C3 with 3 copies.
+ * Current value is derived from RAID1C4 with 4 copies.
  */
-#define BTRFS_MAX_MIRRORS (3 + 1)
+#define BTRFS_MAX_MIRRORS (4 + 1)
 
 #define BTRFS_MAX_LEVEL 8
 

diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c
index a01a5162be708cc6d7d68eebbe488431fa2eed5e..51591caf3de1f2a3d6d0122f3b88be387947e971 100644 (file)
--- a/fs/btrfs/super.c
+++ b/fs/btrfs/super.c
@@ -1938,6 +1938,8 @@ static inline int btrfs_calc_avail_data_space(struct btrfs_fs_info *fs_info,
                num_stripes = 2;
        else if (type & BTRFS_BLOCK_GROUP_RAID1C3)
                num_stripes = 3;
+       else if (type & BTRFS_BLOCK_GROUP_RAID1C4)
+               num_stripes = 4;
        else if (type & BTRFS_BLOCK_GROUP_RAID10)
                num_stripes = 4;
 

diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c
index 7d1f490e06d86787db50166da56d2b60f470c9ab..3e3e9130c6e929d552e1c9819b05b4255c33467d 100644 (file)
--- a/fs/btrfs/volumes.c
+++ b/fs/btrfs/volumes.c
@@ -69,6 +69,18 @@ const struct btrfs_raid_attr btrfs_raid_array[BTRFS_NR_RAID_TYPES] = {
                .bg_flag        = BTRFS_BLOCK_GROUP_RAID1C3,
                .mindev_error   = BTRFS_ERROR_DEV_RAID1C3_MIN_NOT_MET,
        },
+       [BTRFS_RAID_RAID1C4] = {
+               .sub_stripes    = 1,
+               .dev_stripes    = 1,
+               .devs_max       = 0,
+               .devs_min       = 4,
+               .tolerated_failures = 3,
+               .devs_increment = 4,
+               .ncopies        = 4,
+               .raid_name      = "raid1c4",
+               .bg_flag        = BTRFS_BLOCK_GROUP_RAID1C4,
+               .mindev_error   = BTRFS_ERROR_DEV_RAID1C4_MIN_NOT_MET,
+       },
        [BTRFS_RAID_DUP] = {
                .sub_stripes    = 1,
                .dev_stripes    = 2,

diff --git a/fs/btrfs/volumes.h b/fs/btrfs/volumes.h
index f5be2d252d1d950c4dc248ddb2ffbd177d24291a..9b5bbbd678d91b1f73b34e6c28e911d735bfac7a 100644 (file)
--- a/fs/btrfs/volumes.h
+++ b/fs/btrfs/volumes.h
@@ -568,6 +568,8 @@ static inline enum btrfs_raid_types btrfs_bg_flags_to_raid_index(u64 flags)
                return BTRFS_RAID_RAID1;
        else if (flags & BTRFS_BLOCK_GROUP_RAID1C3)
                return BTRFS_RAID_RAID1C3;
+       else if (flags & BTRFS_BLOCK_GROUP_RAID1C4)
+               return BTRFS_RAID_RAID1C4;
        else if (flags & BTRFS_BLOCK_GROUP_DUP)
                return BTRFS_RAID_DUP;
        else if (flags & BTRFS_BLOCK_GROUP_RAID0)

diff --git a/include/uapi/linux/btrfs.h b/include/uapi/linux/btrfs.h
index b03b386cfe2ba18cef73d32dc07bbaecce69b16e..4e32b161adfa7119509c4f1a5c148874f36ff610 100644 (file)
--- a/include/uapi/linux/btrfs.h
+++ b/include/uapi/linux/btrfs.h
@@ -828,6 +828,7 @@ enum btrfs_err_code {
        BTRFS_ERROR_DEV_ONLY_WRITABLE,
        BTRFS_ERROR_DEV_EXCL_RUN_IN_PROGRESS,
        BTRFS_ERROR_DEV_RAID1C3_MIN_NOT_MET,
+       BTRFS_ERROR_DEV_RAID1C4_MIN_NOT_MET,
 };
 
 #define BTRFS_IOC_SNAP_CREATE _IOW(BTRFS_IOCTL_MAGIC, 1, \

diff --git a/include/uapi/linux/btrfs_tree.h b/include/uapi/linux/btrfs_tree.h
index 8ee1092332ed9607364bc9f34d2d70e100578305..16640355700d0ebfa136f3ef3f44fb676f750f79 100644 (file)
--- a/include/uapi/linux/btrfs_tree.h
+++ b/include/uapi/linux/btrfs_tree.h
@@ -840,6 +840,7 @@ struct btrfs_dev_replace_item {
 #define BTRFS_BLOCK_GROUP_RAID5         (1ULL << 7)
 #define BTRFS_BLOCK_GROUP_RAID6         (1ULL << 8)
 #define BTRFS_BLOCK_GROUP_RAID1C3       (1ULL << 9)
+#define BTRFS_BLOCK_GROUP_RAID1C4       (1ULL << 10)
 #define BTRFS_BLOCK_GROUP_RESERVED     (BTRFS_AVAIL_ALLOC_BIT_SINGLE | \
                                         BTRFS_SPACE_INFO_GLOBAL_RSV)
 
@@ -852,6 +853,7 @@ enum btrfs_raid_types {
        BTRFS_RAID_RAID5,
        BTRFS_RAID_RAID6,
        BTRFS_RAID_RAID1C3,
+       BTRFS_RAID_RAID1C4,
        BTRFS_NR_RAID_TYPES
 };
 
@@ -862,6 +864,7 @@ enum btrfs_raid_types {
 #define BTRFS_BLOCK_GROUP_PROFILE_MASK (BTRFS_BLOCK_GROUP_RAID0 |   \
                                         BTRFS_BLOCK_GROUP_RAID1 |   \
                                         BTRFS_BLOCK_GROUP_RAID1C3 | \
+                                        BTRFS_BLOCK_GROUP_RAID1C4 | \
                                         BTRFS_BLOCK_GROUP_RAID5 |   \
                                         BTRFS_BLOCK_GROUP_RAID6 |   \
                                         BTRFS_BLOCK_GROUP_DUP |     \
@@ -870,7 +873,8 @@ enum btrfs_raid_types {
                                         BTRFS_BLOCK_GROUP_RAID6)
 
 #define BTRFS_BLOCK_GROUP_RAID1_MASK   (BTRFS_BLOCK_GROUP_RAID1 |   \
-                                        BTRFS_BLOCK_GROUP_RAID1C3)
+                                        BTRFS_BLOCK_GROUP_RAID1C3 | \
+                                        BTRFS_BLOCK_GROUP_RAID1C4)
 
 /*
  * We need a bit for restriper to be able to tell when chunks of type