aboutsummaryrefslogtreecommitdiffstats
path: root/fs/btrfs/volumes.c
diff options
context:
space:
mode:
authorChris Mason <clm@fb.com>2016-01-29 08:19:37 -0800
committerChris Mason <clm@fb.com>2016-01-29 08:19:37 -0800
commite410e34fad913dd568ec28d2a9949694324c14db (patch)
treec44bcb7e4a1844a17ad960fc7bfdcb73ff8485c5 /fs/btrfs/volumes.c
parentbtrfs: don't use GFP_HIGHMEM for free-space-tree bitmap kzalloc (diff)
downloadlinux-dev-e410e34fad913dd568ec28d2a9949694324c14db.tar.xz
linux-dev-e410e34fad913dd568ec28d2a9949694324c14db.zip
Revert "btrfs: synchronize incompat feature bits with sysfs files"
This reverts commit 14e46e04958df740c6c6a94849f176159a333f13. This ends up doing sysfs operations from deep in balance (where we should be GFP_NOFS) and under heavy balance load, we're making races against sysfs internals. Revert it for now while we figure things out. Signed-off-by: Chris Mason <clm@fb.com>
Diffstat (limited to '')
-rw-r--r--fs/btrfs/volumes.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c
index 5b505f61929e..366b335946fa 100644
--- a/fs/btrfs/volumes.c
+++ b/fs/btrfs/volumes.c
@@ -4469,8 +4469,6 @@ static void check_raid56_incompat_flag(struct btrfs_fs_info *info, u64 type)
return;
btrfs_set_fs_incompat(info, RAID56);
- btrfs_sysfs_feature_update(info, BTRFS_FEATURE_INCOMPAT_RAID56,
- FEAT_INCOMPAT);
}
#define BTRFS_MAX_DEVS(r) ((BTRFS_LEAF_DATA_SIZE(r) \