lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Btrfs: introduce masks for chunk type and profile

Browse Source 
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: Ilya Dryomov <idryomov@gmail.com>
This commit is contained in:
Ilya Dryomov
2012-01-16 22:04:47 +02:00
parent 6fef8df1dc
commit 52ba692972
3 changed files with 21 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
fs/btrfs/ctree.h
View File

@@ -751,15 +751,23 @@ struct btrfs_csum_item {
} __attribute__ ((__packed__)); } __attribute__ ((__packed__));
/* different types of block groups (and chunks) */ /* different types of block groups (and chunks) */
#define BTRFS_BLOCK_GROUP_DATA (1 << 0) #define BTRFS_BLOCK_GROUP_DATA (1ULL << 0)
#define BTRFS_BLOCK_GROUP_SYSTEM (1 << 1) #define BTRFS_BLOCK_GROUP_SYSTEM (1ULL << 1)
#define BTRFS_BLOCK_GROUP_METADATA (1 << 2) #define BTRFS_BLOCK_GROUP_METADATA (1ULL << 2)
#define BTRFS_BLOCK_GROUP_RAID0 (1 << 3) #define BTRFS_BLOCK_GROUP_RAID0 (1ULL << 3)
#define BTRFS_BLOCK_GROUP_RAID1 (1 << 4) #define BTRFS_BLOCK_GROUP_RAID1 (1ULL << 4)
#define BTRFS_BLOCK_GROUP_DUP (1 << 5) #define BTRFS_BLOCK_GROUP_DUP (1ULL << 5)
#define BTRFS_BLOCK_GROUP_RAID10 (1 << 6) #define BTRFS_BLOCK_GROUP_RAID10 (1ULL << 6)
#define BTRFS_NR_RAID_TYPES 5 #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 { struct btrfs_block_group_item {
__le64 used; __le64 used;
__le64 chunk_objectid; __le64 chunk_objectid;

12
fs/btrfs/extent-tree.c
View File

@@ -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 list_head *head = &info->space_info;
struct btrfs_space_info *found; struct btrfs_space_info *found;
flags &= BTRFS_BLOCK_GROUP_DATA | BTRFS_BLOCK_GROUP_SYSTEM | flags &= BTRFS_BLOCK_GROUP_TYPE_MASK;
BTRFS_BLOCK_GROUP_METADATA;
rcu_read_lock(); rcu_read_lock();
list_for_each_entry_rcu(found, head, list) { 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_LIST_HEAD(&found->block_groups[i]);
init_rwsem(&found->groups_sem); init_rwsem(&found->groups_sem);
spin_lock_init(&found->lock); spin_lock_init(&found->lock);
found->flags = flags & (BTRFS_BLOCK_GROUP_DATA | found->flags = flags & BTRFS_BLOCK_GROUP_TYPE_MASK;
BTRFS_BLOCK_GROUP_SYSTEM |
BTRFS_BLOCK_GROUP_METADATA);
found->total_bytes = total_bytes; found->total_bytes = total_bytes;
found->disk_total = total_bytes * factor; found->disk_total = total_bytes * factor;
found->bytes_used = bytes_used; 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) static void set_avail_alloc_bits(struct btrfs_fs_info *fs_info, u64 flags)
{ {
u64 extra_flags = flags & (BTRFS_BLOCK_GROUP_RAID0 | u64 extra_flags = flags & BTRFS_BLOCK_GROUP_PROFILE_MASK;
BTRFS_BLOCK_GROUP_RAID1 |
BTRFS_BLOCK_GROUP_RAID10 |
BTRFS_BLOCK_GROUP_DUP);
if (extra_flags) { if (extra_flags) {
if (flags & BTRFS_BLOCK_GROUP_DATA) if (flags & BTRFS_BLOCK_GROUP_DATA)
fs_info->avail_data_alloc_bits |= extra_flags; fs_info->avail_data_alloc_bits |= extra_flags;

11
fs/btrfs/volumes.c
View File

@@ -2949,12 +2949,8 @@ again:
} }
} }
if (rw & REQ_DISCARD) { if (rw & REQ_DISCARD) {
if (map->type & (BTRFS_BLOCK_GROUP_RAID0 | if (map->type & BTRFS_BLOCK_GROUP_PROFILE_MASK)
BTRFS_BLOCK_GROUP_RAID1 |
BTRFS_BLOCK_GROUP_DUP |
BTRFS_BLOCK_GROUP_RAID10)) {
stripes_required = map->num_stripes; stripes_required = map->num_stripes;
}
} }
if (bbio_ret && (rw & (REQ_WRITE | REQ_DISCARD)) && if (bbio_ret && (rw & (REQ_WRITE | REQ_DISCARD)) &&
stripes_allocated < stripes_required) { stripes_allocated < stripes_required) {
@@ -2978,10 +2974,7 @@ again:
if (rw & REQ_DISCARD) if (rw & REQ_DISCARD)
*length = min_t(u64, em->len - offset, *length); *length = min_t(u64, em->len - offset, *length);
else if (map->type & (BTRFS_BLOCK_GROUP_RAID0 | else if (map->type & BTRFS_BLOCK_GROUP_PROFILE_MASK) {
BTRFS_BLOCK_GROUP_RAID1 |
BTRFS_BLOCK_GROUP_RAID10 |
BTRFS_BLOCK_GROUP_DUP)) {
/* we limit the length of each bio to what fits in a stripe */ /* we limit the length of each bio to what fits in a stripe */
*length = min_t(u64, em->len - offset, *length = min_t(u64, em->len - offset,
map->stripe_len - stripe_offset); map->stripe_len - stripe_offset);