Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 52ba6929 authored by Ilya Dryomov's avatar Ilya Dryomov
Browse files

Btrfs: introduce masks for chunk type and profile 



Chunk's type and profile are encoded in u64 flags field.  Introduce
masks to easily access them.  Also fix the type of BTRFS_BLOCK_GROUP_*
constants, it should be ULL.

Signed-off-by: default avatarIlya Dryomov <idryomov@gmail.com>
parent 6fef8df1

fs/btrfs/ctree.h

+17 −9
Original line number Diff line number Diff line
@@ -751,15 +751,23 @@ struct btrfs_csum_item { 
} __attribute__ ((__packed__));



/* different types of block groups (and chunks) */

#define BTRFS_BLOCK_GROUP_DATA     (1 << 0)

#define BTRFS_BLOCK_GROUP_SYSTEM   (1 << 1)

#define BTRFS_BLOCK_GROUP_METADATA (1 << 2)

#define BTRFS_BLOCK_GROUP_RAID0    (1 << 3)

#define BTRFS_BLOCK_GROUP_RAID1    (1 << 4)

#define BTRFS_BLOCK_GROUP_DUP	   (1 << 5)

#define BTRFS_BLOCK_GROUP_RAID10   (1 << 6)

#define BTRFS_BLOCK_GROUP_DATA		(1ULL << 0)

#define BTRFS_BLOCK_GROUP_SYSTEM	(1ULL << 1)

#define BTRFS_BLOCK_GROUP_METADATA	(1ULL << 2)

#define BTRFS_BLOCK_GROUP_RAID0		(1ULL << 3)

#define BTRFS_BLOCK_GROUP_RAID1		(1ULL << 4)

#define BTRFS_BLOCK_GROUP_DUP		(1ULL << 5)

#define BTRFS_BLOCK_GROUP_RAID10	(1ULL << 6)

#define BTRFS_NR_RAID_TYPES		5



#define BTRFS_BLOCK_GROUP_TYPE_MASK	(BTRFS_BLOCK_GROUP_DATA |    \

					 BTRFS_BLOCK_GROUP_SYSTEM |  \

					 BTRFS_BLOCK_GROUP_METADATA)



#define BTRFS_BLOCK_GROUP_PROFILE_MASK	(BTRFS_BLOCK_GROUP_RAID0 |   \

					 BTRFS_BLOCK_GROUP_RAID1 |   \

					 BTRFS_BLOCK_GROUP_DUP |     \

					 BTRFS_BLOCK_GROUP_RAID10)

struct btrfs_block_group_item {

	__le64 used;

	__le64 chunk_objectid;

fs/btrfs/extent-tree.c

+3 −9
Original line number Diff line number Diff line
@@ -618,8 +618,7 @@ static struct btrfs_space_info *__find_space_info(struct btrfs_fs_info *info, 
	struct list_head *head = &info->space_info;

	struct btrfs_space_info *found;



	flags &= BTRFS_BLOCK_GROUP_DATA | BTRFS_BLOCK_GROUP_SYSTEM |

		 BTRFS_BLOCK_GROUP_METADATA;

	flags &= BTRFS_BLOCK_GROUP_TYPE_MASK;



	rcu_read_lock();

	list_for_each_entry_rcu(found, head, list) {
@@ -2993,9 +2992,7 @@ static int update_space_info(struct btrfs_fs_info *info, u64 flags, 
		INIT_LIST_HEAD(&found->block_groups[i]);

	init_rwsem(&found->groups_sem);

	spin_lock_init(&found->lock);

	found->flags = flags & (BTRFS_BLOCK_GROUP_DATA |

				BTRFS_BLOCK_GROUP_SYSTEM |

				BTRFS_BLOCK_GROUP_METADATA);

	found->flags = flags & BTRFS_BLOCK_GROUP_TYPE_MASK;

	found->total_bytes = total_bytes;

	found->disk_total = total_bytes * factor;

	found->bytes_used = bytes_used;
@@ -3016,10 +3013,7 @@ static int update_space_info(struct btrfs_fs_info *info, u64 flags, 


static void set_avail_alloc_bits(struct btrfs_fs_info *fs_info, u64 flags)

{

	u64 extra_flags = flags & (BTRFS_BLOCK_GROUP_RAID0 |

				   BTRFS_BLOCK_GROUP_RAID1 |

				   BTRFS_BLOCK_GROUP_RAID10 |

				   BTRFS_BLOCK_GROUP_DUP);

	u64 extra_flags = flags & BTRFS_BLOCK_GROUP_PROFILE_MASK;

	if (extra_flags) {

		if (flags & BTRFS_BLOCK_GROUP_DATA)

			fs_info->avail_data_alloc_bits |= extra_flags;

fs/btrfs/volumes.c

+2 −9
Original line number Diff line number Diff line
@@ -2949,13 +2949,9 @@ static int __btrfs_map_block(struct btrfs_mapping_tree *map_tree, int rw, 
		}

	}

	if (rw & REQ_DISCARD) {

		if (map->type & (BTRFS_BLOCK_GROUP_RAID0 |

				 BTRFS_BLOCK_GROUP_RAID1 |

				 BTRFS_BLOCK_GROUP_DUP |

				 BTRFS_BLOCK_GROUP_RAID10)) {

		if (map->type & BTRFS_BLOCK_GROUP_PROFILE_MASK)

			stripes_required = map->num_stripes;

	}

	}

	if (bbio_ret && (rw & (REQ_WRITE | REQ_DISCARD)) &&

	    stripes_allocated < stripes_required) {

		stripes_allocated = map->num_stripes;
@@ -2978,10 +2974,7 @@ static int __btrfs_map_block(struct btrfs_mapping_tree *map_tree, int rw, 


	if (rw & REQ_DISCARD)

		*length = min_t(u64, em->len - offset, *length);

	else if (map->type & (BTRFS_BLOCK_GROUP_RAID0 |

			      BTRFS_BLOCK_GROUP_RAID1 |

			      BTRFS_BLOCK_GROUP_RAID10 |

			      BTRFS_BLOCK_GROUP_DUP)) {

	else if (map->type & BTRFS_BLOCK_GROUP_PROFILE_MASK) {

		/* we limit the length of each bio to what fits in a stripe */

		*length = min_t(u64, em->len - offset,

				map->stripe_len - stripe_offset);