Allow the balancing of chunks where some part of the chunk lies within the virtual (i.e. btrfs-internal) address range passed.
Signed-off-by: Hugo Mills <h...@carfax.org.uk> --- fs/btrfs/ioctl.h | 9 +++++++-- fs/btrfs/volumes.c | 6 ++++++ 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/fs/btrfs/ioctl.h b/fs/btrfs/ioctl.h index 54523c0..50d4801 100644 --- a/fs/btrfs/ioctl.h +++ b/fs/btrfs/ioctl.h @@ -167,7 +167,8 @@ struct btrfs_ioctl_balance_progress { #define BTRFS_BALANCE_FILTER_CHUNK_TYPE (1 << 1) #define BTRFS_BALANCE_FILTER_DEVID (1 << 2) -#define BTRFS_BALANCE_FILTER_MASK ((1 << 3) - 1) /* Logical or of all filter +#define BTRFS_BALANCE_FILTER_VIRTUAL_ADDRESS_RANGE (1 << 3) +#define BTRFS_BALANCE_FILTER_MASK ((1 << 4) - 1) /* Logical or of all filter * flags -- effectively versions * the filtered balance ioctl */ @@ -187,7 +188,11 @@ struct btrfs_ioctl_balance_start { /* For FILTER_DEVID */ __u64 devid; - __u64 spare[505]; /* Make up the size of the structure to 4088 + /* For FILTER_VIRTUAL_ADDRESS_RANGE */ + __u64 vrange_start; + __u64 vrange_end; + + __u64 spare[503]; /* Make up the size of the structure to 4088 * bytes for future expansion */ }; diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c index e7fa2ab..230d100 100644 --- a/fs/btrfs/volumes.c +++ b/fs/btrfs/volumes.c @@ -2070,6 +2070,12 @@ int balance_chunk_filter(struct btrfs_ioctl_balance_start *filter, if (!res) return 0; } + if (filter->flags & BTRFS_BALANCE_FILTER_VIRTUAL_ADDRESS_RANGE) { + u64 start = key->offset; + u64 end = start + btrfs_chunk_length(eb, chunk); + if (filter->vrange_start >= end || start >= filter->vrange_end) + return 0; + } return 1; } -- 1.7.2.5 -- To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html