Skip to content

Commit e605234

Browse files
committed
btrfs: move balance args conversion helpers to volumes.c
The from/to CPU/disk helpers for balance args are used only in volumes, no need to define them in accessors.h. Signed-off-by: David Sterba <dsterba@suse.com>
1 parent 2761ece commit e605234

2 files changed

Lines changed: 38 additions & 39 deletions

File tree

fs/btrfs/accessors.h

Lines changed: 0 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -853,45 +853,6 @@ static inline void btrfs_set_balance_sys(struct extent_buffer *eb,
853853
write_eb_member(eb, bi, struct btrfs_balance_item, sys, ba);
854854
}
855855

856-
static inline void btrfs_disk_balance_args_to_cpu(struct btrfs_balance_args *cpu,
857-
const struct btrfs_disk_balance_args *disk)
858-
{
859-
memset(cpu, 0, sizeof(*cpu));
860-
861-
cpu->profiles = le64_to_cpu(disk->profiles);
862-
cpu->usage = le64_to_cpu(disk->usage);
863-
cpu->devid = le64_to_cpu(disk->devid);
864-
cpu->pstart = le64_to_cpu(disk->pstart);
865-
cpu->pend = le64_to_cpu(disk->pend);
866-
cpu->vstart = le64_to_cpu(disk->vstart);
867-
cpu->vend = le64_to_cpu(disk->vend);
868-
cpu->target = le64_to_cpu(disk->target);
869-
cpu->flags = le64_to_cpu(disk->flags);
870-
cpu->limit = le64_to_cpu(disk->limit);
871-
cpu->stripes_min = le32_to_cpu(disk->stripes_min);
872-
cpu->stripes_max = le32_to_cpu(disk->stripes_max);
873-
}
874-
875-
static inline void btrfs_cpu_balance_args_to_disk(
876-
struct btrfs_disk_balance_args *disk,
877-
const struct btrfs_balance_args *cpu)
878-
{
879-
memset(disk, 0, sizeof(*disk));
880-
881-
disk->profiles = cpu_to_le64(cpu->profiles);
882-
disk->usage = cpu_to_le64(cpu->usage);
883-
disk->devid = cpu_to_le64(cpu->devid);
884-
disk->pstart = cpu_to_le64(cpu->pstart);
885-
disk->pend = cpu_to_le64(cpu->pend);
886-
disk->vstart = cpu_to_le64(cpu->vstart);
887-
disk->vend = cpu_to_le64(cpu->vend);
888-
disk->target = cpu_to_le64(cpu->target);
889-
disk->flags = cpu_to_le64(cpu->flags);
890-
disk->limit = cpu_to_le64(cpu->limit);
891-
disk->stripes_min = cpu_to_le32(cpu->stripes_min);
892-
disk->stripes_max = cpu_to_le32(cpu->stripes_max);
893-
}
894-
895856
/* struct btrfs_super_block */
896857
BTRFS_SETGET_STACK_FUNCS(super_bytenr, struct btrfs_super_block, bytenr, 64);
897858
BTRFS_SETGET_STACK_FUNCS(super_flags, struct btrfs_super_block, flags, 64);

fs/btrfs/volumes.c

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3488,6 +3488,44 @@ static int btrfs_may_alloc_data_chunk(struct btrfs_fs_info *fs_info,
34883488
return 0;
34893489
}
34903490

3491+
static void btrfs_disk_balance_args_to_cpu(struct btrfs_balance_args *cpu,
3492+
const struct btrfs_disk_balance_args *disk)
3493+
{
3494+
memset(cpu, 0, sizeof(*cpu));
3495+
3496+
cpu->profiles = le64_to_cpu(disk->profiles);
3497+
cpu->usage = le64_to_cpu(disk->usage);
3498+
cpu->devid = le64_to_cpu(disk->devid);
3499+
cpu->pstart = le64_to_cpu(disk->pstart);
3500+
cpu->pend = le64_to_cpu(disk->pend);
3501+
cpu->vstart = le64_to_cpu(disk->vstart);
3502+
cpu->vend = le64_to_cpu(disk->vend);
3503+
cpu->target = le64_to_cpu(disk->target);
3504+
cpu->flags = le64_to_cpu(disk->flags);
3505+
cpu->limit = le64_to_cpu(disk->limit);
3506+
cpu->stripes_min = le32_to_cpu(disk->stripes_min);
3507+
cpu->stripes_max = le32_to_cpu(disk->stripes_max);
3508+
}
3509+
3510+
static void btrfs_cpu_balance_args_to_disk(struct btrfs_disk_balance_args *disk,
3511+
const struct btrfs_balance_args *cpu)
3512+
{
3513+
memset(disk, 0, sizeof(*disk));
3514+
3515+
disk->profiles = cpu_to_le64(cpu->profiles);
3516+
disk->usage = cpu_to_le64(cpu->usage);
3517+
disk->devid = cpu_to_le64(cpu->devid);
3518+
disk->pstart = cpu_to_le64(cpu->pstart);
3519+
disk->pend = cpu_to_le64(cpu->pend);
3520+
disk->vstart = cpu_to_le64(cpu->vstart);
3521+
disk->vend = cpu_to_le64(cpu->vend);
3522+
disk->target = cpu_to_le64(cpu->target);
3523+
disk->flags = cpu_to_le64(cpu->flags);
3524+
disk->limit = cpu_to_le64(cpu->limit);
3525+
disk->stripes_min = cpu_to_le32(cpu->stripes_min);
3526+
disk->stripes_max = cpu_to_le32(cpu->stripes_max);
3527+
}
3528+
34913529
static int insert_balance_item(struct btrfs_fs_info *fs_info,
34923530
struct btrfs_balance_control *bctl)
34933531
{

0 commit comments

Comments
 (0)