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>

diff --git a/fs/btrfs/accessors.h b/fs/btrfs/accessors.h
index fa099f61fc8ce64859459e8f5364e5a568b885b2..6fce3e8d3dac527cb5e8bd44ff8fa1cc685f583d 100644 (file)
--- a/fs/btrfs/accessors.h
+++ b/fs/btrfs/accessors.h
@@ -853,45 +853,6 @@ static inline void btrfs_set_balance_sys(struct extent_buffer *eb,
        write_eb_member(eb, bi, struct btrfs_balance_item, sys, ba);
 }
 
-static inline void btrfs_disk_balance_args_to_cpu(struct btrfs_balance_args *cpu,
-                              const struct btrfs_disk_balance_args *disk)
-{
-       memset(cpu, 0, sizeof(*cpu));
-
-       cpu->profiles = le64_to_cpu(disk->profiles);
-       cpu->usage = le64_to_cpu(disk->usage);
-       cpu->devid = le64_to_cpu(disk->devid);
-       cpu->pstart = le64_to_cpu(disk->pstart);
-       cpu->pend = le64_to_cpu(disk->pend);
-       cpu->vstart = le64_to_cpu(disk->vstart);
-       cpu->vend = le64_to_cpu(disk->vend);
-       cpu->target = le64_to_cpu(disk->target);
-       cpu->flags = le64_to_cpu(disk->flags);
-       cpu->limit = le64_to_cpu(disk->limit);
-       cpu->stripes_min = le32_to_cpu(disk->stripes_min);
-       cpu->stripes_max = le32_to_cpu(disk->stripes_max);
-}
-
-static inline void btrfs_cpu_balance_args_to_disk(
-                               struct btrfs_disk_balance_args *disk,
-                               const struct btrfs_balance_args *cpu)
-{
-       memset(disk, 0, sizeof(*disk));
-
-       disk->profiles = cpu_to_le64(cpu->profiles);
-       disk->usage = cpu_to_le64(cpu->usage);
-       disk->devid = cpu_to_le64(cpu->devid);
-       disk->pstart = cpu_to_le64(cpu->pstart);
-       disk->pend = cpu_to_le64(cpu->pend);
-       disk->vstart = cpu_to_le64(cpu->vstart);
-       disk->vend = cpu_to_le64(cpu->vend);
-       disk->target = cpu_to_le64(cpu->target);
-       disk->flags = cpu_to_le64(cpu->flags);
-       disk->limit = cpu_to_le64(cpu->limit);
-       disk->stripes_min = cpu_to_le32(cpu->stripes_min);
-       disk->stripes_max = cpu_to_le32(cpu->stripes_max);
-}
-
 /* struct btrfs_super_block */
 BTRFS_SETGET_STACK_FUNCS(super_bytenr, struct btrfs_super_block, bytenr, 64);
 BTRFS_SETGET_STACK_FUNCS(super_flags, struct btrfs_super_block, flags, 64);

diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c
index 4ad9eca9b46c4ac8ea161bb14801ade2c1b229da..32312f0de2bb8d1e1a3746e1c8437180f3029bdd 100644 (file)
--- a/fs/btrfs/volumes.c
+++ b/fs/btrfs/volumes.c
@@ -3488,6 +3488,44 @@ static int btrfs_may_alloc_data_chunk(struct btrfs_fs_info *fs_info,
        return 0;
 }
 
+static void btrfs_disk_balance_args_to_cpu(struct btrfs_balance_args *cpu,
+                                          const struct btrfs_disk_balance_args *disk)
+{
+       memset(cpu, 0, sizeof(*cpu));
+
+       cpu->profiles = le64_to_cpu(disk->profiles);
+       cpu->usage = le64_to_cpu(disk->usage);
+       cpu->devid = le64_to_cpu(disk->devid);
+       cpu->pstart = le64_to_cpu(disk->pstart);
+       cpu->pend = le64_to_cpu(disk->pend);
+       cpu->vstart = le64_to_cpu(disk->vstart);
+       cpu->vend = le64_to_cpu(disk->vend);
+       cpu->target = le64_to_cpu(disk->target);
+       cpu->flags = le64_to_cpu(disk->flags);
+       cpu->limit = le64_to_cpu(disk->limit);
+       cpu->stripes_min = le32_to_cpu(disk->stripes_min);
+       cpu->stripes_max = le32_to_cpu(disk->stripes_max);
+}
+
+static void btrfs_cpu_balance_args_to_disk(struct btrfs_disk_balance_args *disk,
+                                          const struct btrfs_balance_args *cpu)
+{
+       memset(disk, 0, sizeof(*disk));
+
+       disk->profiles = cpu_to_le64(cpu->profiles);
+       disk->usage = cpu_to_le64(cpu->usage);
+       disk->devid = cpu_to_le64(cpu->devid);
+       disk->pstart = cpu_to_le64(cpu->pstart);
+       disk->pend = cpu_to_le64(cpu->pend);
+       disk->vstart = cpu_to_le64(cpu->vstart);
+       disk->vend = cpu_to_le64(cpu->vend);
+       disk->target = cpu_to_le64(cpu->target);
+       disk->flags = cpu_to_le64(cpu->flags);
+       disk->limit = cpu_to_le64(cpu->limit);
+       disk->stripes_min = cpu_to_le32(cpu->stripes_min);
+       disk->stripes_max = cpu_to_le32(cpu->stripes_max);
+}
+
 static int insert_balance_item(struct btrfs_fs_info *fs_info,
                               struct btrfs_balance_control *bctl)
 {