diff options
| author | Chris Mason <clm@fb.com> | 2016-01-29 08:19:37 -0800 |
|---|---|---|
| committer | Chris Mason <clm@fb.com> | 2016-01-29 08:19:37 -0800 |
| commit | e410e34fad913dd568ec28d2a9949694324c14db (patch) | |
| tree | c44bcb7e4a1844a17ad960fc7bfdcb73ff8485c5 /fs/btrfs/super.c | |
| parent | e1c0ebad3f77387c6684f8b7e86a4bbaca7577ac (diff) | |
| download | linux-e410e34fad913dd568ec28d2a9949694324c14db.tar.bz2 | |
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/super.c')
| -rw-r--r-- | fs/btrfs/super.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c index 49b424103c32..a8e049ae933d 100644 --- a/fs/btrfs/super.c +++ b/fs/btrfs/super.c @@ -58,7 +58,6 @@ #include "dev-replace.h" #include "free-space-cache.h" #include "backref.h" -#include "sysfs.h" #include "tests/btrfs-tests.h" #include "qgroup.h" @@ -486,9 +485,6 @@ int btrfs_parse_options(struct btrfs_root *root, char *options) btrfs_clear_opt(info->mount_opt, NODATACOW); btrfs_clear_opt(info->mount_opt, NODATASUM); btrfs_set_fs_incompat(info, COMPRESS_LZO); - btrfs_sysfs_feature_update(root->fs_info, - BTRFS_FEATURE_INCOMPAT_COMPRESS_LZO, - FEAT_INCOMPAT); no_compress = 0; } else if (strncmp(args[0].from, "no", 2) == 0) { compress_type = "no"; |