]> git.hungrycats.org Git - linux/commitdiff
btrfs: fix clashing number of the enhanced balance usage filter
authorDavid Sterba <dsterba@suse.com>
Mon, 16 Nov 2015 15:50:13 +0000 (16:50 +0100)
committerZygo Blaxell <zblaxell@serenity.furryterror.org>
Tue, 19 Jan 2016 05:13:06 +0000 (00:13 -0500)
I've accidentally picked an already used number for the enhanced usage
filter represented by BTRFS_BALANCE_ARGS_USAGE_RANGE, clashing with
BTRFS_BALANCE_ARGS_CONVERT. Introduced during the development phase,
no backward compatibility issues.

Reported-by: Holger Hoffstätte <holger.hoffstaette@googlemail.com>
Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Fixes: bc3094673f22 ("btrfs: extend balance filter usage to take minimum and maximum")
Signed-off-by: David Sterba <dsterba@suse.com>
Signed-off-by: Chris Mason <clm@fb.com>
(cherry picked from commit da02c6898952a2bc251dd51ed9f897e0a72a853e)
(cherry picked from commit 26e346a1109ff15b9a7cd559140ad2013afa20ec)

fs/btrfs/volumes.h

index ca17e897a0108956632c9175e218fd393b0bdc0a..62bc137a341e2866b99eecd64d4db525a358e1c3 100644 (file)
@@ -377,7 +377,7 @@ struct map_lookup {
 #define BTRFS_BALANCE_ARGS_LIMIT       (1ULL << 5)
 #define BTRFS_BALANCE_ARGS_LIMIT_RANGE (1ULL << 6)
 #define BTRFS_BALANCE_ARGS_STRIPES_RANGE (1ULL << 7)
-#define BTRFS_BALANCE_ARGS_USAGE_RANGE (1ULL << 8)
+#define BTRFS_BALANCE_ARGS_USAGE_RANGE (1ULL << 10)
 
 #define BTRFS_BALANCE_ARGS_MASK                        \
        (BTRFS_BALANCE_ARGS_PROFILES |          \