diff options
| author | Chris Mason <clm@fb.com> | 2016-01-29 16:19:37 (GMT) |
|---|---|---|
| committer | Chris Mason <clm@fb.com> | 2016-01-29 16:19:37 (GMT) |
| commit | e410e34fad913dd568ec28d2a9949694324c14db (patch) | |
| tree | c44bcb7e4a1844a17ad960fc7bfdcb73ff8485c5 /fs/btrfs/ioctl.c | |
| parent | e1c0ebad3f77387c6684f8b7e86a4bbaca7577ac (diff) | |
| download | linux-e410e34fad913dd568ec28d2a9949694324c14db.tar.xz | |
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/ioctl.c')
| -rw-r--r-- | fs/btrfs/ioctl.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c index 1568f57..83c9ad3 100644 --- a/fs/btrfs/ioctl.c +++ b/fs/btrfs/ioctl.c @@ -1459,8 +1459,6 @@ int btrfs_defrag_file(struct inode *inode, struct file *file, if (range->compress_type == BTRFS_COMPRESS_LZO) { btrfs_set_fs_incompat(root->fs_info, COMPRESS_LZO); - btrfs_sysfs_feature_update(root->fs_info, - BTRFS_FEATURE_INCOMPAT_COMPRESS_LZO, FEAT_INCOMPAT); } ret = defrag_count; @@ -4069,8 +4067,6 @@ static long btrfs_ioctl_default_subvol(struct file *file, void __user *argp) btrfs_free_path(path); btrfs_set_fs_incompat(root->fs_info, DEFAULT_SUBVOL); - btrfs_sysfs_feature_update(root->fs_info, - BTRFS_FEATURE_INCOMPAT_DEFAULT_SUBVOL, FEAT_INCOMPAT); btrfs_end_transaction(trans, root); out: mnt_drop_write_file(file); |