summaryrefslogtreecommitdiffstats
path: root/fs/btrfs/free-space-tree.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/free-space-tree.c
parente1c0ebad3f77387c6684f8b7e86a4bbaca7577ac (diff)
downloadlinux-e410e34fad913dd568ec28d2a9949694324c14db.tar.gz
linux-e410e34fad913dd568ec28d2a9949694324c14db.tar.bz2
linux-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 'fs/btrfs/free-space-tree.c')
-rw-r--r--fs/btrfs/free-space-tree.c7
1 files changed, 0 insertions, 7 deletions
diff --git a/fs/btrfs/free-space-tree.c b/fs/btrfs/free-space-tree.c
index 81a053d2966b..53dbeaf6ce94 100644
--- a/fs/btrfs/free-space-tree.c
+++ b/fs/btrfs/free-space-tree.c
@@ -23,7 +23,6 @@
#include "locking.h"
#include "free-space-tree.h"
#include "transaction.h"
-#include "sysfs.h"
static int __add_block_group_free_space(struct btrfs_trans_handle *trans,
struct btrfs_fs_info *fs_info,
@@ -1184,9 +1183,6 @@ int btrfs_create_free_space_tree(struct btrfs_fs_info *fs_info)
}
btrfs_set_fs_compat_ro(fs_info, FREE_SPACE_TREE);
- btrfs_sysfs_feature_update(fs_info,
- BTRFS_FEATURE_COMPAT_RO_FREE_SPACE_TREE, FEAT_COMPAT_RO);
-
fs_info->creating_free_space_tree = 0;
ret = btrfs_commit_transaction(trans, tree_root);
@@ -1255,9 +1251,6 @@ int btrfs_clear_free_space_tree(struct btrfs_fs_info *fs_info)
return PTR_ERR(trans);
btrfs_clear_fs_compat_ro(fs_info, FREE_SPACE_TREE);
- btrfs_sysfs_feature_update(fs_info,
- BTRFS_FEATURE_COMPAT_RO_FREE_SPACE_TREE, FEAT_COMPAT_RO);
-
fs_info->free_space_root = NULL;
ret = clear_free_space_tree(trans, free_space_root);