Revert "btrfs: add stripes filter"

This reverts commit 0d81fe3f074bea75acc7e3ee1fd2a43d98633618.

(cherry picked from commit 9653dac9b310b7a502190dfe79ba41ed364d3863)

diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h
index 14cd59eb4a92ed605d71e95e84f166a22f1aa43e..415a339090c0a8cbec7533a5c074001314e38440 100644 (file)
--- a/fs/btrfs/ctree.h
+++ b/fs/btrfs/ctree.h
@@ -849,11 +849,7 @@ struct btrfs_disk_balance_args {
        /* BTRFS_BALANCE_ARGS_LIMIT value */
        __le64 limit;
 
-       /* btrfs stripes filter */
-       __le64 sstart;
-       __le64 send;
-
-       __le64 unused[5];
+       __le64 unused[7];
 } __attribute__ ((__packed__));
 
 /*

diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c
index fea1aefa2b3057238b634f53d64a4a32bd734c0d..b380feb1879ef11b9ff29902f9b1f14af4324cd4 100644 (file)
--- a/fs/btrfs/volumes.c
+++ b/fs/btrfs/volumes.c
@@ -3157,18 +3157,6 @@ static int chunk_vrange_filter(struct extent_buffer *leaf,
        return 1;
 }
 
-static int chunk_stripes_filter(struct extent_buffer *leaf,
-                              struct btrfs_chunk *chunk,
-                              struct btrfs_balance_args *bargs)
-{
-       int num_stripes = btrfs_chunk_num_stripes(leaf, chunk);
-
-       if (bargs->sstart <= num_stripes && num_stripes <= bargs->send)
-               return 0;
-
-       return 1;
-}
-
 static int chunk_soft_convert_filter(u64 chunk_type,
                                     struct btrfs_balance_args *bargs)
 {
@@ -3235,12 +3223,6 @@ static int should_balance_chunk(struct btrfs_root *root,
                return 0;
        }
 
-       /* stripes filter */
-       if ((bargs->flags & BTRFS_BALANCE_ARGS_STRIPES) &&
-           chunk_stripes_filter(leaf, chunk, bargs)) {
-               return 0;
-       }
-
        /* soft profile changing mode */
        if ((bargs->flags & BTRFS_BALANCE_ARGS_SOFT) &&
            chunk_soft_convert_filter(chunk_type, bargs)) {

diff --git a/fs/btrfs/volumes.h b/fs/btrfs/volumes.h
index 68447992915b1c350e7e61e3c772ca5ca85e2fe3..de36732b18a5f8a521ca231309f7953da7836faa 100644 (file)
--- a/fs/btrfs/volumes.h
+++ b/fs/btrfs/volumes.h
@@ -375,7 +375,6 @@ struct map_lookup {
 #define BTRFS_BALANCE_ARGS_DRANGE      (1ULL << 3)
 #define BTRFS_BALANCE_ARGS_VRANGE      (1ULL << 4)
 #define BTRFS_BALANCE_ARGS_LIMIT       (1ULL << 5)
-#define BTRFS_BALANCE_ARGS_STRIPES     (1ULL << 6)
 
 #define BTRFS_BALANCE_ARGS_MASK                        \
        (BTRFS_BALANCE_ARGS_PROFILES |          \

diff --git a/include/uapi/linux/btrfs.h b/include/uapi/linux/btrfs.h
index a7819d07ad42a28100818c9903bbcaba00c8db6f..b6dec05c7196a22511e346242724406eef88265b 100644 (file)
--- a/include/uapi/linux/btrfs.h
+++ b/include/uapi/linux/btrfs.h
@@ -218,11 +218,7 @@ struct btrfs_balance_args {
        __u64 flags;
 
        __u64 limit;            /* limit number of processed chunks */
-
-       __u64 sstart;
-       __u64 send;
-
-       __u64 unused[5];
+       __u64 unused[7];
 } __attribute__ ((__packed__));
 
 /* report balance progress to userspace */