Skip to content

Commit e410e34

Browse files
committed
Revert "btrfs: synchronize incompat feature bits with sysfs files"
This reverts commit 14e46e0. 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 <[email protected]>
1 parent e1c0eba commit e410e34

File tree

4 files changed

+0
-17
lines changed

4 files changed

+0
-17
lines changed

fs/btrfs/free-space-tree.c

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
#include "locking.h"
2424
#include "free-space-tree.h"
2525
#include "transaction.h"
26-
#include "sysfs.h"
2726

2827
static int __add_block_group_free_space(struct btrfs_trans_handle *trans,
2928
struct btrfs_fs_info *fs_info,
@@ -1184,9 +1183,6 @@ int btrfs_create_free_space_tree(struct btrfs_fs_info *fs_info)
11841183
}
11851184

11861185
btrfs_set_fs_compat_ro(fs_info, FREE_SPACE_TREE);
1187-
btrfs_sysfs_feature_update(fs_info,
1188-
BTRFS_FEATURE_COMPAT_RO_FREE_SPACE_TREE, FEAT_COMPAT_RO);
1189-
11901186
fs_info->creating_free_space_tree = 0;
11911187

11921188
ret = btrfs_commit_transaction(trans, tree_root);
@@ -1255,9 +1251,6 @@ int btrfs_clear_free_space_tree(struct btrfs_fs_info *fs_info)
12551251
return PTR_ERR(trans);
12561252

12571253
btrfs_clear_fs_compat_ro(fs_info, FREE_SPACE_TREE);
1258-
btrfs_sysfs_feature_update(fs_info,
1259-
BTRFS_FEATURE_COMPAT_RO_FREE_SPACE_TREE, FEAT_COMPAT_RO);
1260-
12611254
fs_info->free_space_root = NULL;
12621255

12631256
ret = clear_free_space_tree(trans, free_space_root);

fs/btrfs/ioctl.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1459,8 +1459,6 @@ int btrfs_defrag_file(struct inode *inode, struct file *file,
14591459

14601460
if (range->compress_type == BTRFS_COMPRESS_LZO) {
14611461
btrfs_set_fs_incompat(root->fs_info, COMPRESS_LZO);
1462-
btrfs_sysfs_feature_update(root->fs_info,
1463-
BTRFS_FEATURE_INCOMPAT_COMPRESS_LZO, FEAT_INCOMPAT);
14641462
}
14651463

14661464
ret = defrag_count;
@@ -4069,8 +4067,6 @@ static long btrfs_ioctl_default_subvol(struct file *file, void __user *argp)
40694067
btrfs_free_path(path);
40704068

40714069
btrfs_set_fs_incompat(root->fs_info, DEFAULT_SUBVOL);
4072-
btrfs_sysfs_feature_update(root->fs_info,
4073-
BTRFS_FEATURE_INCOMPAT_DEFAULT_SUBVOL, FEAT_INCOMPAT);
40744070
btrfs_end_transaction(trans, root);
40754071
out:
40764072
mnt_drop_write_file(file);

fs/btrfs/super.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@
5858
#include "dev-replace.h"
5959
#include "free-space-cache.h"
6060
#include "backref.h"
61-
#include "sysfs.h"
6261
#include "tests/btrfs-tests.h"
6362

6463
#include "qgroup.h"
@@ -486,9 +485,6 @@ int btrfs_parse_options(struct btrfs_root *root, char *options)
486485
btrfs_clear_opt(info->mount_opt, NODATACOW);
487486
btrfs_clear_opt(info->mount_opt, NODATASUM);
488487
btrfs_set_fs_incompat(info, COMPRESS_LZO);
489-
btrfs_sysfs_feature_update(root->fs_info,
490-
BTRFS_FEATURE_INCOMPAT_COMPRESS_LZO,
491-
FEAT_INCOMPAT);
492488
no_compress = 0;
493489
} else if (strncmp(args[0].from, "no", 2) == 0) {
494490
compress_type = "no";

fs/btrfs/volumes.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4469,8 +4469,6 @@ static void check_raid56_incompat_flag(struct btrfs_fs_info *info, u64 type)
44694469
return;
44704470

44714471
btrfs_set_fs_incompat(info, RAID56);
4472-
btrfs_sysfs_feature_update(info, BTRFS_FEATURE_INCOMPAT_RAID56,
4473-
FEAT_INCOMPAT);
44744472
}
44754473

44764474
#define BTRFS_MAX_DEVS(r) ((BTRFS_LEAF_DATA_SIZE(r) \

0 commit comments

Comments
 (0)