diff options
| author | Chris Mason <clm@fb.com> | 2016-01-26 03:43:13 +0300 |
|---|---|---|
| committer | Chris Mason <clm@fb.com> | 2016-01-26 03:43:13 +0300 |
| commit | 6b5aa88c861cf0e4156e490009e2018d4fc81109 (patch) | |
| tree | 5a8735c21895edc590517bce47ae1645341cdbfa /fs/btrfs/ioctl.c | |
| parent | a6111d11b8b5364d02ea2e881c81ce39d004eb32 (diff) | |
| parent | 14e46e04958df740c6c6a94849f176159a333f13 (diff) | |
| download | linux-6b5aa88c861cf0e4156e490009e2018d4fc81109.tar.xz | |
Merge branch 'fix/fst-sysfs' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux into for-linus-4.5
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, 4 insertions, 0 deletions
diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c index 83c9ad3f2621..1568f57a3376 100644 --- a/fs/btrfs/ioctl.c +++ b/fs/btrfs/ioctl.c @@ -1459,6 +1459,8 @@ 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; @@ -4067,6 +4069,8 @@ 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); |